From 09c55d36e5b01284ff39e1fdcfff7c83a8a88aa6 Mon Sep 17 00:00:00 2001 From: Veena Arvind Date: Tue, 6 Jun 2023 18:42:42 +0000 Subject: [DO NOT MERGE] Increase timeout for UIAutomation In android U, the timeout was increased. Backporting this change to this branch to allow tests to pass for partner devices. Bug: 281653513 Test: Partner device (b/281653513#comment29) Change-Id: I0859bdd7005638e16b6d265f33132d17b47b7d0a --- core/java/android/app/Instrumentation.java | 2 +- 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; -- cgit v1.2.3-59-g8ed1b