From 61c93dc8c3981725a9cfd52f76d9caca9100b9d6 Mon Sep 17 00:00:00 2001
From: Fangqiu Su <fangqiu@google.com>
Date: Mon, 24 Apr 2023 17:49:02 +0000
Subject: [PATCH] Update uiautomator references in
 packages/apps/Settings/tests/perftests

* Remove unused dependencies.
* Replace "ub-uiautomator" (v2.2.0) with
  "androidx.test.uiautomator_uiautomator" (v2.3.0).

Bug: 235842600
Test: mmma .
Change-Id: I19484ff3b0c7f9db24534b175c2d321ac5a30909
---
 tests/perftests/Android.bp                                | 2 +-
 .../android/settings/tests/perf/LaunchSettingsTest.java   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/perftests/Android.bp b/tests/perftests/Android.bp
index c03c57f3742..7d3b75bb021 100644
--- a/tests/perftests/Android.bp
+++ b/tests/perftests/Android.bp
@@ -18,7 +18,7 @@ android_test {
 
     static_libs: [
         "androidx.test.rules",
-        "ub-uiautomator",
+        "androidx.test.uiautomator_uiautomator",
     ],
 
     // Include all test java files.
diff --git a/tests/perftests/src/com/android/settings/tests/perf/LaunchSettingsTest.java b/tests/perftests/src/com/android/settings/tests/perf/LaunchSettingsTest.java
index a8c5230fb8d..ca5c79f1018 100644
--- a/tests/perftests/src/com/android/settings/tests/perf/LaunchSettingsTest.java
+++ b/tests/perftests/src/com/android/settings/tests/perf/LaunchSettingsTest.java
@@ -22,13 +22,13 @@ import static junit.framework.TestCase.fail;
 import android.app.Instrumentation;
 import android.os.Bundle;
 import android.util.Log;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiSelector;
-import android.support.test.uiautomator.Until;
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiSelector;
+import androidx.test.uiautomator.Until;
 
 import org.junit.After;
 import org.junit.Before;