commit f7ae26a1a13c52f1d1bb0f9214d613334ed63550
author George Mount <mount@google.com> Fri Jun 15 15:02:03 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 15 15:02:03 2012 -0700
tree 3e63753f2eb71206a536945235c262fd7bd24357
parent da429d774a06fe442bc2e07fb4c25958ab59c67f
parent 4be56f80010337ee5672b14c3b20a06d9c079f5e

Merge "DO NOT MERGE Close hole in synchronize-protected member variable." into jb-dev

tests/src/android/webkit/cts/WebViewOnUiThread.java

diff --git a/tests/src/android/webkit/cts/WebViewOnUiThread.java b/tests/src/android/webkit/cts/WebViewOnUiThread.java
index 895022a..0a1547e 100644
--- a/tests/src/android/webkit/cts/WebViewOnUiThread.java
+++ b/tests/src/android/webkit/cts/WebViewOnUiThread.java
@@ -661,10 +661,12 @@
      * @param call The call to make on the UI thread prior to waiting.
      */
     private void callAndWait(Runnable call) {
-        Assert.assertTrue("WebViewOnUiThread.load*AndWaitForCompletion calls "
-                + "may not be mixed with load* calls directly on WebView "
-                + "without calling waitForLoadCompletion after the load",
-                !mLoaded);
+        synchronized (this) {
+            Assert.assertTrue("WebViewOnUiThread.load*AndWaitForCompletion calls "
+                    + "may not be mixed with load* calls directly on WebView "
+                    + "without calling waitForLoadCompletion after the load",
+                    !mLoaded);
+        }
         runOnUiThread(call);
         waitForLoadCompletion();
     }