am 2674aef2: am 9a1b3754: am 9fad3f3d: Merge "Avoid testSetKeepUpdated to be scheduling dependant" into gingerbread

* commit '2674aef29b462cbed2af4c7e426f1ddb36bb5059':
  Avoid testSetKeepUpdated to be scheduling dependant
diff --git a/tests/tests/content/src/android/content/cts/ContentQueryMapTest.java b/tests/tests/content/src/android/content/cts/ContentQueryMapTest.java
index d5d9666..ecb1c05 100644
--- a/tests/tests/content/src/android/content/cts/ContentQueryMapTest.java
+++ b/tests/tests/content/src/android/content/cts/ContentQueryMapTest.java
@@ -263,9 +263,16 @@
             public void run() {
                 Looper.prepare();
                 mContentQueryMap.setKeepUpdated(true);
+                synchronized (ContentQueryMapTest.this) {
+                    //listener is ready, release the sender thread
+                    ContentQueryMapTest.this.notify();
+                }
                 Looper.loop();
             }
         }).start();
+        synchronized (this) {
+            wait(TEST_TIME_OUT);
+        }//wait the listener to be ready before launching onChange event
 
         // insert NAME3 and VALUE3
         values = new ContentValues();
@@ -285,9 +292,16 @@
             public void run() {
                 Looper.prepare();
                 mContentQueryMap.setKeepUpdated(false);
+                synchronized (ContentQueryMapTest.this) {
+                    //listener is ready, release the sender thread
+                    ContentQueryMapTest.this.notify();
+                }
                 Looper.loop();
             }
         }).start();
+        synchronized (this) {
+            wait(TEST_TIME_OUT);
+        }//wait the listener to be ready before launching onChange event
         // update NAME3 and VALUE3
         values = new ContentValues();
         values.put(DummyProvider.NAME, NAME0);