summaryrefslogtreecommitdiff
path: root/core/java/android/webkit/WebSettings.java
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-05-24 19:54:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-24 19:54:11 -0700
commit2221e34ba539c3dea16f48659afaf100ca0c477f (patch)
treeb19cbcc6cb9d94bf2d2cf6cf6c592892cb64bd98 /core/java/android/webkit/WebSettings.java
parentc9e3608fa6625e845ef718156ce7fcdc6f705e16 (diff)
parent00bcea1ac3be490e2730d15a6406541341dd3853 (diff)
am 00bcea1a: am dc8a53a7: am 2959916b: Merge "Update the Desktop UA to Chrome" into honeycomb-mr2
* commit '00bcea1ac3be490e2730d15a6406541341dd3853': Update the Desktop UA to Chrome
Diffstat (limited to 'core/java/android/webkit/WebSettings.java')
-rw-r--r--core/java/android/webkit/WebSettings.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index b0b16bb9d736..66fcc2775a8d 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -360,10 +360,9 @@ public class WebSettings {
}
// User agent strings.
- private static final String DESKTOP_USERAGENT =
- "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_7; en-us)"
- + " AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0"
- + " Safari/530.17";
+ private static final String DESKTOP_USERAGENT = "Mozilla/5.0 (X11; " +
+ "Linux x86_64) AppleWebKit/534.24 (KHTML, like Gecko) " +
+ "Chrome/11.0.696.34 Safari/534.24";
private static final String IPHONE_USERAGENT =
"Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_0 like Mac OS X; en-us)"
+ " AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0"