am 00d2eba5: am 9af67e8f: Merge "Add getDefaultUserAgent to WebSettings." into jb-mr1-dev

* commit '00d2eba50172a6763f3414c092be05a3b283b851':
  Add getDefaultUserAgent to WebSettings.

1 files changed, 13 insertions, 0 deletions

diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index 26c4d33..e2addc6 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -16,6 +16,7 @@
 
 package android.webkit;
 
+import android.content.Context;
 import android.os.Message;
 import android.os.Build;
 
@@ -1257,6 +1258,18 @@ public abstract class WebSettings {
     }
 
     /**
+     * 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
+     */
+    public static String getDefaultUserAgent(Context context) {
+        return WebView.getFactory().getDefaultUserAgent(context);
+    }
+
+    /**
      * Tells the WebView whether it needs to set a node to have focus when
      * {@link WebView#requestFocus(int, android.graphics.Rect)} is called. The
      * default value is true.