From 951fcabef694ce3a78c1e7a8d03a27bd337db021 Mon Sep 17 00:00:00 2001
From: Jonathan Dixon <joth@google.com>
Date: Mon, 20 Aug 2012 16:37:15 -0700
Subject: [PATCH] Small tidy up to getDefaultUserAgent. DO NOT MERGE

- no need for WebSettings to bounce via WebView to get to the factory
- move this static (non-factory) method into the Statics inner class.

Bug: 6329117

Clean cherry pick: d1c4faa5a4c2be71d529d35572c5f807beee7ddc

Change-Id: I96807df0171c7308421ca8811cfcb1bf710cb007
---
 core/java/android/webkit/WebSettings.java        |  4 +---
 core/java/android/webkit/WebView.java            |  2 +-
 .../android/webkit/WebViewFactoryProvider.java   | 16 ++++++----------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index 074f91070c326..423f0ea85a484 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
@@ -1235,7 +1233,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 4c5699b194632..436762d66caa7 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 b1d42aa4fbccc..934ef83db185d 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);
 }