summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit/WebSettings.java
diff options
context:
space:
mode:
authorJonathan Dixon <joth@google.com>2012-08-20 16:37:15 -0700
committerSelim Gurun <sgurun@google.com>2012-08-21 16:08:22 -0700
commit951fcabef694ce3a78c1e7a8d03a27bd337db021 (patch)
tree83d137758e810164510484c3f6bd4df00b09896a /core/java/android/webkit/WebSettings.java
parentdf5c3a54c7e955fb89951b63ff49f275a53f9c35 (diff)
downloadframeworks_base-951fcabef694ce3a78c1e7a8d03a27bd337db021.zip
frameworks_base-951fcabef694ce3a78c1e7a8d03a27bd337db021.tar.gz
frameworks_base-951fcabef694ce3a78c1e7a8d03a27bd337db021.tar.bz2
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
Diffstat (limited to 'core/java/android/webkit/WebSettings.java')
-rw-r--r--core/java/android/webkit/WebSettings.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index 074f910..423f0ea 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);
}
/**