summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-08-07 21:01:27 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-08-07 21:01:27 +0000
commita3fe176a9441fc7f075cc051fd9c06119988ca47 (patch)
tree8b20e38fc52d3a02ede53deb8837a71704031584
parent7ae91f8a280241edb4ea98944c93aa158961537f (diff)
parent33aa44327fc07d5b70b3293ae8af8d3c546f7fbe (diff)
downloadcts-a3fe176a9441fc7f075cc051fd9c06119988ca47.tar.gz
Merge "Increase timeouts for CtsDynamicMimeHostTestCases" into stage-aosp-rvc-ts-dev
-rw-r--r--hostsidetests/packagemanager/dynamicmime/test/src/android/dynamicmime/testapp/preferred/PreferredActivitiesTest.java2
-rw-r--r--hostsidetests/packagemanager/dynamicmime/test/src/android/dynamicmime/testapp/util/AppMimeGroups.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/hostsidetests/packagemanager/dynamicmime/test/src/android/dynamicmime/testapp/preferred/PreferredActivitiesTest.java b/hostsidetests/packagemanager/dynamicmime/test/src/android/dynamicmime/testapp/preferred/PreferredActivitiesTest.java
index d37b0f568bc..5b19d4b07b7 100644
--- a/hostsidetests/packagemanager/dynamicmime/test/src/android/dynamicmime/testapp/preferred/PreferredActivitiesTest.java
+++ b/hostsidetests/packagemanager/dynamicmime/test/src/android/dynamicmime/testapp/preferred/PreferredActivitiesTest.java
@@ -58,7 +58,7 @@ public class PreferredActivitiesTest extends BaseDynamicMimeTest {
private static final BySelector BUTTON_ALWAYS = By.res("android:id/button_always");
- private static final long TIMEOUT = TimeUnit.SECONDS.toMillis(30L);
+ private static final long TIMEOUT = TimeUnit.SECONDS.toMillis(60L);
private TestStrategy mTest;
diff --git a/hostsidetests/packagemanager/dynamicmime/test/src/android/dynamicmime/testapp/util/AppMimeGroups.java b/hostsidetests/packagemanager/dynamicmime/test/src/android/dynamicmime/testapp/util/AppMimeGroups.java
index 09da28ef960..935cbf6686b 100644
--- a/hostsidetests/packagemanager/dynamicmime/test/src/android/dynamicmime/testapp/util/AppMimeGroups.java
+++ b/hostsidetests/packagemanager/dynamicmime/test/src/android/dynamicmime/testapp/util/AppMimeGroups.java
@@ -72,7 +72,7 @@ public class AppMimeGroups {
mContext.sendBroadcast(getRequestIntent(mimeGroup, mimeTypes, request));
- Intent response = receiver.awaitForBroadcast(TimeUnit.SECONDS.toMillis(5L));
+ Intent response = receiver.awaitForBroadcast(TimeUnit.SECONDS.toMillis(60L));
mContext.unregisterReceiver(receiver);