commit 14ae0cb842071ded1ce6e7a9af46d457e96df0ef
author John Reck <jreck@google.com> Tue Jan 18 12:10:22 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 18 12:10:22 2011 -0800
tree 4b7da473fd0303f22b0b5f9a924ee04593b2f642
parent 760e91cd8552db8c63913df244c66b9d5825c8bd
parent 3977afe41679290fedbe661e53dcf360136f52d0

am 3977afe4: am d00207ff: Merge "WebStorage public API change" into honeycomb

* commit '3977afe41679290fedbe661e53dcf360136f52d0':
  WebStorage public API change

api/current.xml

diff --git a/api/current.xml b/api/current.xml
index e64b28e..46aa6f6 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -237811,6 +237811,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"

core/java/android/webkit/WebStorage.java

diff --git a/core/java/android/webkit/WebStorage.java b/core/java/android/webkit/WebStorage.java
index 5345879..257ed2a 100644
--- a/core/java/android/webkit/WebStorage.java
+++ b/core/java/android/webkit/WebStorage.java
@@ -75,23 +75,23 @@
     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;
         }