am 9371b0d4: Merge "Fix expected user agent string for new WebKit version." into froyo

Merge commit '9371b0d4e0b5334dcf4ad59c89931d1a8e0053b3' into froyo-plus-aosp

* commit '9371b0d4e0b5334dcf4ad59c89931d1a8e0053b3':
  Fix expected user agent string for new WebKit version.

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java b/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
index 79a112b9604..5e7572d9df3 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
@@ -80,14 +80,14 @@ public class WebSettingsTest extends ActivityInstrumentationTestCase2<WebViewStu
      * compatibility definition:
      * <p/>
      * Mozilla/5.0 (Linux; U; Android <version>; <language>-<country>; <devicemodel>;
-     * Build/<buildID>) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17
+     * Build/<buildID>) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
      */
     public void testUserAgentString_default() {
         final String actualUserAgentString = mSettings.getUserAgentString();
         Log.i(LOG_TAG, String.format("Checking user agent string %s", actualUserAgentString));
         final String patternString = "Mozilla/5\\.0 \\(Linux; U; Android (.+); (\\w+)-(\\w+);" +
-            " (.+) Build/(.+)\\) AppleWebKit/530\\.17 \\(KHTML, like Gecko\\) Version/4\\.0" +
-            " Mobile Safari/530\\.17";
+            " (.+) Build/(.+)\\) AppleWebKit/533\\.1 \\(KHTML, like Gecko\\) Version/4\\.0" +
+            " Mobile Safari/533\\.1";
         Log.i(LOG_TAG, String.format("Trying to match pattern %s", patternString));
         final Pattern userAgentExpr = Pattern.compile(patternString);
         Matcher patternMatcher = userAgentExpr.matcher(actualUserAgentString);