diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-22 20:36:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-06-22 20:36:51 +0000 |
| commit | 0257c4a85cbb95b49cd1a9099ec3d79884ad3ef6 (patch) | |
| tree | c87f3db9fee703d40e9c8c2953be46bbc521701b | |
| parent | 9eb22e2f6a100ac4c11e27f97fb20cc3a587039c (diff) | |
| parent | b6c4b0ec87241c98787a40b6802f9c7f37ac3a8f (diff) | |
| download | base-android-vts-13.0_r5.tar.gz | |
Merge "Snap for 10366328 from c25a6786ff4a7bd05947b9ed1bba8febdbdde2c2 to android13-tests-release" into android13-tests-releaseandroid-vts-13.0_r5android-cts-13.0_r6android-cts-13.0_r5
| -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; |