Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 731ca02b authored by Veena Arvind's avatar Veena Arvind Committed by Automerger Merge Worker
Browse files

Merge "[DO NOT MERGE] Increase timeout for UIAutomation" into... 

Merge "[DO NOT MERGE] Increase timeout for UIAutomation" into android13-tests-dev am: c25a6786 am: 0d483468 am: c7f5a0db

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2617830



Change-Id: Iee73e74333cfa5eb4ab66a88dea009b1cbba1be1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c6a7ba39 c7f5a0db

core/java/android/app/Instrumentation.java

+1 −1
Original line number Diff line number Diff line
@@ -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

core/java/android/app/UiAutomation.java

+1 −1
Original line number Diff line number Diff line
@@ -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;