Merge "More robust tests." into tm-qpr-dev

services/tests/PackageManagerServiceTests/server/src/com/android/server/PackageManagerTests.java

@@ -197,10 +197,11 @@ public class PackageManagerTests extends AndroidTestCase {
         }
 
         public Intent getResult() {
-            try {
+            while (true) {
-                return mResult.take();
+                try {
-            } catch (InterruptedException e) {
+                    return mResult.take();
-                throw new RuntimeException(e);
+                } catch (InterruptedException e) {
+                }
             }
         }
     }