summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Veena Arvind <aveena@google.com> 2023-06-22 01:02:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-22 01:02:44 +0000
commit524bf3896120cb99e8f7a2601f0ddabe6e43fe91 (patch)
tree8af95d96b251434940a80bd531633d112f5151cb
parent63a224eae97333f801914d88e54a15776b60b5c0 (diff)
parentb6ed103e46a6b41b59f9a04c9ee301488ce7dde8 (diff)
[DO NOT MERGE] Increase timeout for UIAutomation am: 09c55d36e5 am: 2f7078a5ca am: b6ed103e46
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2617830 Change-Id: I815726b967f44efc0f6f703c0f27d5d55804b7ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/app/Instrumentation.java2
-rw-r--r--core/java/android/app/UiAutomation.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java
index 556058b567f9..2fa3a7ecb7dd 100644
--- a/core/java/android/app/Instrumentation.java
+++ b/core/java/android/app/Instrumentation.java
@@ -91,7 +91,7 @@ public class Instrumentation {
private static final String TAG = "Instrumentation";
- private static final long CONNECT_TIMEOUT_MILLIS = 5000;
+ private static final long CONNECT_TIMEOUT_MILLIS = 60000;
/**
* @hide
diff --git a/core/java/android/app/UiAutomation.java b/core/java/android/app/UiAutomation.java
index ac6759396c8f..9568f68fb99c 100644
--- a/core/java/android/app/UiAutomation.java
+++ b/core/java/android/app/UiAutomation.java
@@ -113,7 +113,7 @@ public final class UiAutomation {
private static final int CONNECTION_ID_UNDEFINED = -1;
- private static final long CONNECT_TIMEOUT_MILLIS = 5000;
+ private static final long CONNECT_TIMEOUT_MILLIS = 60000;
/** Rotation constant: Unfreeze rotation (rotating the device changes its rotation state). */
public static final int ROTATION_UNFREEZE = -2;