From a05d7f5b1ee88cf38c41820522e2162ce9accc51 Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Mon, 6 Feb 2023 15:01:10 -0800
Subject: [PATCH] Extend getUiAutomation() timeout from 5 seconds to 60 seconds

Test: atest CtsShortFgsTestCases
Bug: 266521938
Change-Id: I192a115b8c67bdf544cf8a5dd9a70b350899cf4e
Merged-In: I192a115b8c67bdf544cf8a5dd9a70b350899cf4e
(cherry picked from commit d7853658cacb7181b750131c3e63bc75b1c2473f)
---
 core/java/android/app/Instrumentation.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java
index 5cad1aeb9fe72..ac928116481fb 100644
--- a/core/java/android/app/Instrumentation.java
+++ b/core/java/android/app/Instrumentation.java
@@ -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);