| commit | 49e631387c92b96c3c7e2d9f313dbd62cd1423c0 | [log] [tgz] |
|---|---|---|
| author | Yichun Li <yichunli@google.com> | Tue Apr 18 21:37:55 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 18 21:37:55 2023 +0000 |
| tree | f0979ec476f17b7102a33d84c32427d408da5476 | |
| parent | 0fc710efb94c801e2607ef067b90a2e3f98fc7f9 [diff] | |
| parent | 6b982465e8fc1ad5feac3d65ccb918abc677ed9e [diff] |
Merge "Update uiautomator references in frameworks/base/tests/ActivityManagerPerfTests/utils" am: 6b982465e8 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2531560 Change-Id: I8343fd92cece03b881a401adb935d463a517a85a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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", ], }
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;