| commit | 2f7078a5ca3d15f4d04d8f804b2693843295ed28 | [log] [tgz] |
|---|---|---|
| author | Veena Arvind <aveena@google.com> | Thu Jun 22 00:12:48 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 22 00:12:48 2023 +0000 |
| tree | 2a2206060bf28c15b88e05a7df6ce24745833b04 | |
| parent | 563fe1116c5e1260b185fbacbeb662feaecfb124 [diff] | |
| parent | 09c55d36e5b01284ff39e1fdcfff7c83a8a88aa6 [diff] |
[DO NOT MERGE] Increase timeout for UIAutomation am: 09c55d36e5 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2617830 Change-Id: Ibfb600a3d6ea489c6a6d6fe4ec9e625bb131f78a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java index 8984c42..da5f308 100644 --- a/core/java/android/app/Instrumentation.java +++ b/core/java/android/app/Instrumentation.java
@@ -91,7 +91,7 @@ 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 ac67593..9568f68 100644 --- a/core/java/android/app/UiAutomation.java +++ b/core/java/android/app/UiAutomation.java
@@ -113,7 +113,7 @@ 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;