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

Commit 09c55d36 authored by Veena Arvind's avatar Veena Arvind
Browse files

[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
parent c805f9c0

core/java/android/app/Instrumentation.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -91,7 +91,7 @@ public class Instrumentation { 




    private static final String TAG = "Instrumentation";

    private static final String TAG = "Instrumentation";





    private static final long CONNECT_TIMEOUT_MILLIS = 5000;

    private static final long CONNECT_TIMEOUT_MILLIS = 60000;





    /**

    /**

     * @hide

     * @hide

core/java/android/app/UiAutomation.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -113,7 +113,7 @@ public final class UiAutomation { 




    private static final int CONNECTION_ID_UNDEFINED = -1;

    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). */

    /** Rotation constant: Unfreeze rotation (rotating the device changes its rotation state). */

    public static final int ROTATION_UNFREEZE = -2;

    public static final int ROTATION_UNFREEZE = -2;