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

Commit 7dc4933f authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Gerrit Code Review
Browse files

Merge changes from topic "am-4d6ad82e46eb430685e35e0bf1b406a4" 

* changes:
  Merge "[DO NOT MERGE] Increase timeout for UIAutomation" into android13-tests-dev am: c25a6786
  [DO NOT MERGE] Increase timeout for UIAutomation am: 09c55d36
parents 8c52e78a 0d483468

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;