commit 3f0ac62e87d341d13f257fd1b54149e75f83d96d
author George Mount <mount@google.com> Mon Jun 18 10:32:23 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 18 10:32:23 2012 -0700
tree 8639d53cf3feb160d29edd5aa4fe0c54028857f3
parent d2d022c592c7c9999990f2985113ddb0793e2e55
parent f7ae26a1a13c52f1d1bb0f9214d613334ed63550

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

* commit 'f7ae26a1a13c52f1d1bb0f9214d613334ed63550':
  DO NOT MERGE Close hole in synchronize-protected member variable.

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();
     }