summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYichun Li <yichunli@google.com>2023-07-24 19:29:26 +0000
committerCherrypicker Worker <android-build-cherrypicker-worker@google.com>2023-10-13 15:01:36 +0000
commitdae4e9d43309e08670dcbca39374d84fd5d2ec9b (patch)
treef0fe3a3ebbe6dd25dede75e6cf8573d3a152c30b
parent824f349a0225e1a67e4cbbacd81e34755c1d8f97 (diff)
downloadmobile-data-download-dae4e9d43309e08670dcbca39374d84fd5d2ec9b.tar.gz
Update uiautomator references in external/mobile-data-download
* Remove unused dependencies. * Replace "ub-uiautomator" (v2.2.0) with "androidx.test.uiautomator_uiautomator" (v2.3.0). Bug: 235842600 Test: presubmit (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:446e53dafdbbdf3041b396a1e989f1e988610020) Merged-In: Idd8baaf31aaba6a466fedba64ca3e50b30932e5e Change-Id: Idd8baaf31aaba6a466fedba64ca3e50b30932e5e
-rw-r--r--Android.bp2
-rw-r--r--javatests/com/google/android/libraries/mobiledatadownload/file/backends/BlobStoreBackendTest.java2
-rw-r--r--javatests/com/google/android/libraries/mobiledatadownload/internal/MddTestUtil.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index d52d055..a49ddf9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -62,7 +62,7 @@ android_library {
],
libs: [
- "ub-uiautomator",
+ "androidx.test.uiautomator_uiautomator",
"androidx.test.ext.truth",
"androidx.test.rules",
"androidx.annotation_annotation",
diff --git a/javatests/com/google/android/libraries/mobiledatadownload/file/backends/BlobStoreBackendTest.java b/javatests/com/google/android/libraries/mobiledatadownload/file/backends/BlobStoreBackendTest.java
index c172205..7de85c2 100644
--- a/javatests/com/google/android/libraries/mobiledatadownload/file/backends/BlobStoreBackendTest.java
+++ b/javatests/com/google/android/libraries/mobiledatadownload/file/backends/BlobStoreBackendTest.java
@@ -24,10 +24,10 @@ import android.app.blob.BlobStoreManager;
import android.content.Context;
import android.net.Uri;
import android.os.ParcelFileDescriptor;
-import android.support.test.uiautomator.UiDevice;
import android.util.Log;
import android.util.Pair;
import androidx.test.core.app.ApplicationProvider;
+import androidx.test.uiautomator.UiDevice;
import com.google.android.libraries.mobiledatadownload.file.common.LimitExceededException;
import com.google.common.io.BaseEncoding;
import com.google.common.io.ByteStreams;
diff --git a/javatests/com/google/android/libraries/mobiledatadownload/internal/MddTestUtil.java b/javatests/com/google/android/libraries/mobiledatadownload/internal/MddTestUtil.java
index e3976c7..433a7aa 100644
--- a/javatests/com/google/android/libraries/mobiledatadownload/internal/MddTestUtil.java
+++ b/javatests/com/google/android/libraries/mobiledatadownload/internal/MddTestUtil.java
@@ -23,8 +23,8 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS;
import android.content.Context;
import android.os.Build.VERSION;
-import android.support.test.uiautomator.UiDevice;
import android.util.Log;
+import androidx.test.uiautomator.UiDevice;
import com.google.mobiledatadownload.internal.MetadataProto.BaseFile;
import com.google.mobiledatadownload.internal.MetadataProto.DataFile;
import com.google.mobiledatadownload.internal.MetadataProto.DataFileGroupInternal;