From 87745ce21fe3f65b8cf7a92372c24227821318d3 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Tue, 30 Nov 2010 14:00:54 -0800
Subject: [PATCH] WebStorage public API change

 Bug: 3241140
 Adds generic type parameters to the Map in the getOrigins method
 and makes WebStorage.Origin class public.

Change-Id: I20e38d294486126f4719bad5fa99f5e3320a1026
---
 api/current.xml                          | 42 ++++++++++++++++++++++++
 core/java/android/webkit/WebStorage.java | 14 ++++----
 2 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/api/current.xml b/api/current.xml
index 6371a3222240f..db471c9943647 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -233932,6 +233932,48 @@
 </parameter>
 </method>
 </class>
+<class name="WebStorage.Origin"
+ extends="java.lang.Object"
+ abstract="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="getOrigin"
+ return="java.lang.String"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getQuota"
+ return="long"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getUsage"
+ return="long"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+</class>
 <interface name="WebStorage.QuotaUpdater"
  abstract="true"
  static="true"
diff --git a/core/java/android/webkit/WebStorage.java b/core/java/android/webkit/WebStorage.java
index 5345879ca6dfb..257ed2a4011e7 100644
--- a/core/java/android/webkit/WebStorage.java
+++ b/core/java/android/webkit/WebStorage.java
@@ -75,23 +75,23 @@ public final class WebStorage {
     private Handler mHandler = null;
     private Handler mUIHandler = null;
 
-    static class Origin {
-        String mOrigin = null;
-        long mQuota = 0;
-        long mUsage = 0;
+    public static class Origin {
+        private String mOrigin = null;
+        private long mQuota = 0;
+        private long mUsage = 0;
 
-        public Origin(String origin, long quota, long usage) {
+        private Origin(String origin, long quota, long usage) {
             mOrigin = origin;
             mQuota = quota;
             mUsage = usage;
         }
 
-        public Origin(String origin, long quota) {
+        private Origin(String origin, long quota) {
             mOrigin = origin;
             mQuota = quota;
         }
 
-        public Origin(String origin) {
+        private Origin(String origin) {
             mOrigin = origin;
         }