diff options
| author | Andrei Popescu <andreip@google.com> | 2010-01-08 09:49:31 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-08 09:49:31 -0800 |
| commit | b816377fed0180ff0b132a8d9891e51fb3527138 (patch) | |
| tree | 5f7aa4ba9b5bbb24cd9734c5533e9d278f6ee972 /core | |
| parent | 29eadcf376c107afae2a55fcde74d3c484c4fa4f (diff) | |
| parent | 98409704134c262fdaab47055f60b7e01a4bc0b2 (diff) | |
| download | frameworks_base-b816377fed0180ff0b132a8d9891e51fb3527138.zip frameworks_base-b816377fed0180ff0b132a8d9891e51fb3527138.tar.gz frameworks_base-b816377fed0180ff0b132a8d9891e51fb3527138.tar.bz2 | |
Merge "Fix a bug where the usage for an origin shows up as 0 in Website Settings when the origin uses app cache but not database."
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/webkit/WebStorage.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebStorage.java b/core/java/android/webkit/WebStorage.java index a182287..cf71a84 100644 --- a/core/java/android/webkit/WebStorage.java +++ b/core/java/android/webkit/WebStorage.java @@ -389,8 +389,8 @@ public final class WebStorage { mOrigins = new HashMap<String, Origin>(); for (String origin : tmp) { Origin website = new Origin(origin, - nativeGetUsageForOrigin(origin), - nativeGetQuotaForOrigin(origin)); + nativeGetQuotaForOrigin(origin), + nativeGetUsageForOrigin(origin)); mOrigins.put(origin, website); } } |