commit 6af45b8fabce9a9f279531c0f10151a8ca653a1a
author Daniel Peykov <peykov@google.com> Tue Oct 11 20:24:27 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 11 20:24:27 2022 +0000
tree d29e1b2aba56375ea3491e2a6fe0a25ef1d061d7
parent a2a9b4566346208115aa09cf4e2c555a05d0e1dc
parent dfe7fc99a3b53129f51b9edced625680ac0adc30

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>

packages/SystemUI/Android.bp

diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index 5e0d935..753e110 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -221,7 +221,7 @@
         "metrics-helper-lib",
         "hamcrest-library",
         "androidx.test.rules",
-        "androidx.test.uiautomator",
+        "androidx.test.uiautomator_uiautomator",
         "mockito-target-extended-minus-junit4",
         "testables",
         "truth-prebuilt",

tests/TrustTests/Android.bp

diff --git a/tests/TrustTests/Android.bp b/tests/TrustTests/Android.bp
index 77f98e8..a1b888a 100644
--- a/tests/TrustTests/Android.bp
+++ b/tests/TrustTests/Android.bp
@@ -24,7 +24,7 @@
     static_libs: [
         "androidx.test.rules",
         "androidx.test.ext.junit",
-        "androidx.test.uiautomator",
+        "androidx.test.uiautomator_uiautomator",
         "mockito-target-minus-junit4",
         "servicestests-utils",
         "truth-prebuilt",