am 3d6de021: Merge "Increased a CTS test timeout from 5 sec to 30 sec. This test was already flaky on L phones and tablets, but it almost never passed on Clockwork Coral (L) devices. Now it passes. Bug: 18040863 Bug: 18533405" into lmp-sprout-dev
* commit '3d6de0212fb5e0b3400c918a07760a163cb409d0':
Increased a CTS test timeout from 5 sec to 30 sec. This test was already flaky on L phones and tablets, but it almost never passed on Clockwork Coral (L) devices. Now it passes. Bug: 18040863 Bug: 18533405
diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/src/com/android/cts/usespermissiondiffcertapp/AccessPermissionWithDiffSigTest.java b/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/src/com/android/cts/usespermissiondiffcertapp/AccessPermissionWithDiffSigTest.java
index 5378266..cf16307 100644
--- a/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/src/com/android/cts/usespermissiondiffcertapp/AccessPermissionWithDiffSigTest.java
+++ b/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/src/com/android/cts/usespermissiondiffcertapp/AccessPermissionWithDiffSigTest.java
@@ -429,6 +429,7 @@
boolean mHaveResult = false;
boolean mGoodResult = false;
boolean mSucceeded = false;
+ static final int TIMEOUT_MS = 30000;
@Override
public void onReceive(Context context, Intent intent) {
@@ -456,10 +457,10 @@
final long startTime = SystemClock.uptimeMillis();
while (!mHaveResult) {
try {
- wait(5000);
+ wait(TIMEOUT_MS);
} catch (InterruptedException e) {
}
- if (SystemClock.uptimeMillis() >= (startTime+5000)) {
+ if (SystemClock.uptimeMillis() >= (startTime + TIMEOUT_MS)) {
throw new RuntimeException("Timeout");
}
}
@@ -477,10 +478,10 @@
final long startTime = SystemClock.uptimeMillis();
while (!mHaveResult) {
try {
- wait(5000);
+ wait(TIMEOUT_MS);
} catch (InterruptedException e) {
}
- if (SystemClock.uptimeMillis() >= (startTime+5000)) {
+ if (SystemClock.uptimeMillis() >= (startTime + TIMEOUT_MS)) {
throw new RuntimeException("Timeout");
}
}