commit 6b982465e8fc1ad5feac3d65ccb918abc677ed9e
author Yichun Li <yichunli@google.com> Tue Apr 18 20:54:18 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 18 20:54:18 2023 +0000
tree f0979ec476f17b7102a33d84c32427d408da5476
parent a1355bc271fb4c20f879f5c75921c4f6f82a793b
parent 71d21d8ba126f67c2da735dc7bcbbf63cecdc035

Merge "Update uiautomator references in frameworks/base/tests/ActivityManagerPerfTests/utils"

tests/ActivityManagerPerfTests/utils/Android.bp

diff --git a/tests/ActivityManagerPerfTests/utils/Android.bp b/tests/ActivityManagerPerfTests/utils/Android.bp
index 99c43c8..5902c1c 100644
--- a/tests/ActivityManagerPerfTests/utils/Android.bp
+++ b/tests/ActivityManagerPerfTests/utils/Android.bp
@@ -32,6 +32,6 @@
     static_libs: [
         "androidx.test.rules",
         "junit",
-        "ub-uiautomator",
+        "androidx.test.uiautomator_uiautomator",
     ],
 }

tests/ActivityManagerPerfTests/utils/src/com/android/frameworks/perftests/am/util/Utils.java

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 fc787ba..9bd94f2 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 @@
 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;