summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yichun Li <yichunli@google.com> 2023-04-18 20:54:18 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-04-18 20:54:18 +0000
commit6b982465e8fc1ad5feac3d65ccb918abc677ed9e (patch)
treef0979ec476f17b7102a33d84c32427d408da5476
parenta1355bc271fb4c20f879f5c75921c4f6f82a793b (diff)
parent71d21d8ba126f67c2da735dc7bcbbf63cecdc035 (diff)
Merge "Update uiautomator references in frameworks/base/tests/ActivityManagerPerfTests/utils"
-rw-r--r--tests/ActivityManagerPerfTests/utils/Android.bp2
-rw-r--r--tests/ActivityManagerPerfTests/utils/src/com/android/frameworks/perftests/am/util/Utils.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/ActivityManagerPerfTests/utils/Android.bp b/tests/ActivityManagerPerfTests/utils/Android.bp
index 99c43c8d8fca..5902c1cbda15 100644
--- a/tests/ActivityManagerPerfTests/utils/Android.bp
+++ b/tests/ActivityManagerPerfTests/utils/Android.bp
@@ -32,6 +32,6 @@ java_test {
static_libs: [
"androidx.test.rules",
"junit",
- "ub-uiautomator",
+ "androidx.test.uiautomator_uiautomator",
],
}
diff --git a/tests/ActivityManagerPerfTests/utils/src/com/android/frameworks/perftests/am/util/Utils.java b/tests/ActivityManagerPerfTests/utils/src/com/android/frameworks/perftests/am/util/Utils.java
index fc787bafa93a..9bd94f2a9a1e 100644
--- a/tests/ActivityManagerPerfTests/utils/src/com/android/frameworks/perftests/am/util/Utils.java
+++ b/tests/ActivityManagerPerfTests/utils/src/com/android/frameworks/perftests/am/util/Utils.java
@@ -19,10 +19,10 @@ package com.android.frameworks.perftests.am.util;
import android.content.Intent;
import android.os.RemoteException;
import android.os.ResultReceiver;
-import android.support.test.uiautomator.UiDevice;
import android.util.Log;
import androidx.test.InstrumentationRegistry;
+import androidx.test.uiautomator.UiDevice;
import java.io.IOException;