summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Daniel Peykov <peykov@google.com> 2022-10-11 20:24:27 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-11 20:24:27 +0000
commit6af45b8fabce9a9f279531c0f10151a8ca653a1a (patch)
treed29e1b2aba56375ea3491e2a6fe0a25ef1d061d7
parenta2a9b4566346208115aa09cf4e2c555a05d0e1dc (diff)
parentdfe7fc99a3b53129f51b9edced625680ac0adc30 (diff)
Merge "Update uiautomator references in frameworks/base" am: b6d9367bc9 am: 089f7d6380 am: dfe7fc99a3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2219973 Change-Id: I23e11be0d0c897f4da759941ca5b7741d8398165 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--packages/SystemUI/Android.bp2
-rw-r--r--tests/TrustTests/Android.bp2
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index 5e0d93548dc3..753e11099717 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -221,7 +221,7 @@ android_library {
"metrics-helper-lib",
"hamcrest-library",
"androidx.test.rules",
- "androidx.test.uiautomator",
+ "androidx.test.uiautomator_uiautomator",
"mockito-target-extended-minus-junit4",
"testables",
"truth-prebuilt",
diff --git a/tests/TrustTests/Android.bp b/tests/TrustTests/Android.bp
index 77f98e88f1eb..a1b888aef934 100644
--- a/tests/TrustTests/Android.bp
+++ b/tests/TrustTests/Android.bp
@@ -24,7 +24,7 @@ android_test {
static_libs: [
"androidx.test.rules",
"androidx.test.ext.junit",
- "androidx.test.uiautomator",
+ "androidx.test.uiautomator_uiautomator",
"mockito-target-minus-junit4",
"servicestests-utils",
"truth-prebuilt",