Merge "Small tidy up to getDefaultUserAgent. DO NOT MERGE" into jb-mr1-dev

3 files changed, 8 insertions, 14 deletions

diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index 02c144f52371..e8ff01f7e449 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -17,8 +17,6 @@
 package android.webkit;
 
 import android.content.Context;
-import android.os.Message;
-import android.os.Build;
 
 /**
  * Manages settings state for a WebView. When a WebView is first created, it
@@ -1248,7 +1246,7 @@ public abstract class WebSettings {
      * @param context a Context object used to access application assets
      */
     public static String getDefaultUserAgent(Context context) {
-        return WebView.getFactory().getDefaultUserAgent(context);
+        return WebViewFactory.getProvider().getStatics().getDefaultUserAgent(context);
     }
 
     /**
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 4c5699b19463..436762d66caa 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -1821,7 +1821,7 @@ public class WebView extends AbsoluteLayout
         }
     }
 
-    static synchronized WebViewFactoryProvider getFactory() {
+    private static synchronized WebViewFactoryProvider getFactory() {
         // For now the main purpose of this function (and the factory abstration) is to keep
         // us honest and minimize usage of WebViewClassic internals when binding the proxy.
         checkThread();
diff --git a/core/java/android/webkit/WebViewFactoryProvider.java b/core/java/android/webkit/WebViewFactoryProvider.java
index b1d42aa4fbcc..934ef83db185 100644
--- a/core/java/android/webkit/WebViewFactoryProvider.java
+++ b/core/java/android/webkit/WebViewFactoryProvider.java
@@ -42,6 +42,12 @@ public interface WebViewFactoryProvider {
          * {@link android.webkit.WebView#disablePlatformNotifications()}
          */
         void setPlatformNotificationsEnabled(boolean enable);
+
+        /**
+         * Implements the API method:
+         * {@link android.webkit.WebSettings#getDefaultUserAgent(Context) }
+         */
+        String getDefaultUserAgent(Context context);
     }
 
     Statics getStatics();
@@ -93,14 +99,4 @@ public interface WebViewFactoryProvider {
      * @return the singleton WebViewDatabase instance
      */
     WebViewDatabase getWebViewDatabase(Context context);
-
-    /**
-     * Returns the default User-Agent used by a WebView.
-     * An instance of WebView could use a different User-Agent if a call
-     * is made to {@link WebSettings#setUserAgent(int)} or
-     * {@link WebSettings#setUserAgentString(String)}.
-     *
-     * @param context a Context object used to access application assets
-     */
-    String getDefaultUserAgent(Context context);
 }