Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "am-4d6ad82e46eb430685e35e0bf1b406a4"

Browse Source 
* changes:
  Merge "[DO NOT MERGE] Increase timeout for UIAutomation" into android13-tests-dev am: c25a6786ff
  [DO NOT MERGE] Increase timeout for UIAutomation am: 09c55d36e5
This commit is contained in:
Automerger Merge Worker
2023-06-22 00:17:57 +00:00
committed by Gerrit Code Review
parent 8c52e78a19 0d48346820
commit 7dc4933f14
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/Instrumentation.java
View File

@@ -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

2
core/java/android/app/UiAutomation.java
View File

@@ -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;