commit 1196db2e29dec0e8216dd9f0febef123277657a7
author Brian Muramatsu <btmura@android.com> Thu Feb 10 13:53:05 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Feb 10 13:53:05 2011 -0800
tree 961bc5abb716152042b552acda49172f96508d7f
parent 716950a0c4d3fb65cf15bc85ed2dc6d4a275957b
parent 77c594a1b897d86a90bf0b17daa522350e4730a6

am 77c594a1: am ef3f73f5: am 5a2cfdc6: Merge "Timing issue in CTS tc "testPermissionDiffCert"" into gingerbread

* commit '77c594a1b897d86a90bf0b17daa522350e4730a6':
  Timing issue in CTS tc "testPermissionDiffCert"

tests/appsecurity-tests/test-apps/UsePermissionDiffCert/src/com/android/cts/usespermissiondiffcertapp/AccessPermissionWithDiffSigTest.java

diff --git a/tests/appsecurity-tests/test-apps/UsePermissionDiffCert/src/com/android/cts/usespermissiondiffcertapp/AccessPermissionWithDiffSigTest.java b/tests/appsecurity-tests/test-apps/UsePermissionDiffCert/src/com/android/cts/usespermissiondiffcertapp/AccessPermissionWithDiffSigTest.java
index 63a65e4..1723077 100644
--- a/tests/appsecurity-tests/test-apps/UsePermissionDiffCert/src/com/android/cts/usespermissiondiffcertapp/AccessPermissionWithDiffSigTest.java
+++ b/tests/appsecurity-tests/test-apps/UsePermissionDiffCert/src/com/android/cts/usespermissiondiffcertapp/AccessPermissionWithDiffSigTest.java
@@ -408,13 +408,11 @@
         // Dispose of activity.
         ReceiveUriActivity.finishCurInstanceSync();
 
-        if (false) {
-            synchronized (this) {
-                Log.i("**", "******************************* WAITING!!!");
-                try {
-                    wait(10000);
-                } catch (InterruptedException e) {
-                }
+        synchronized (this) {
+            Log.i("**", "******************************* WAITING!!!");
+            try {
+                wait(100);
+            } catch (InterruptedException e) {
             }
         }
 
@@ -495,13 +493,11 @@
         // Dispose of activity.
         ReceiveUriActivity.finishCurInstanceSync();
 
-        if (false) {
-            synchronized (this) {
-                Log.i("**", "******************************* WAITING!!!");
-                try {
-                    wait(10000);
-                } catch (InterruptedException e) {
-                }
+        synchronized (this) {
+            Log.i("**", "******************************* WAITING!!!");
+            try {
+                wait(100);
+            } catch (InterruptedException e) {
             }
         }