diff options
| author | Veena Arvind <aveena@google.com> | 2023-06-21 23:31:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-06-21 23:31:23 +0000 |
| commit | c25a6786ff4a7bd05947b9ed1bba8febdbdde2c2 (patch) | |
| tree | c87f3db9fee703d40e9c8c2953be46bbc521701b | |
| parent | c805f9c0e5ad665ad144b5115b7e53c747f3cc94 (diff) | |
| parent | 09c55d36e5b01284ff39e1fdcfff7c83a8a88aa6 (diff) | |
| download | base-c25a6786ff4a7bd05947b9ed1bba8febdbdde2c2.tar.gz | |
Merge "[DO NOT MERGE] Increase timeout for UIAutomation" into android13-tests-dev
| -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; |