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

Commit 1464250e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Extend getUiAutomation() timeout from 5 seconds to 60 seconds" into udc-dev am: 607cea01 

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



Change-Id: I16083e54e63751dcf9d6086b484d0c39efe13cc1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 971454f4 607cea01

core/java/android/app/Instrumentation.java

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,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 = 60_000;



    private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);