diff options
| author | Veena Arvind <aveena@google.com> | 2023-06-22 00:18:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-22 00:18:11 +0000 |
| commit | 8fd2093cf2e24f671da32b20cef25d84e1c7db49 (patch) | |
| tree | 0b84b56572adb72da3412c406b67becdb56f302c | |
| parent | 0291ea6b1c59fa0cdbfb285499f4eaa0519356e3 (diff) | |
| parent | 2f7078a5ca3d15f4d04d8f804b2693843295ed28 (diff) | |
| download | base-8fd2093cf2e24f671da32b20cef25d84e1c7db49.tar.gz | |
[DO NOT MERGE] Increase timeout for UIAutomation am: 09c55d36e5 am: 2f7078a5ca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2617830
Change-Id: Iac2d68860f6ad89b4fecfd1f6b3126c139cc93d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/app/Instrumentation.java | 2 | ||||
| -rw-r--r-- | core/java/android/app/UiAutomation.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java index 8984c4292023..da5f308a9958 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; |