diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-12-16 04:01:31 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-12-16 04:01:31 +0000 |
commit | dcc3607de58ddc2431c14ff860401f6a3226aeed (patch) | |
tree | 35950b15531836715da1980005502ab50e5222b8 | |
parent | ef618d981947f6d8242755516269a0026c07126c (diff) | |
parent | b0838843e019a232f9a439f895a658f58a369bd0 (diff) | |
download | droiddriver-android10-mainline-a-release.tar.gz |
Snap for 5184694 from b0838843e019a232f9a439f895a658f58a369bd0 to qt-releaseandroid-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-vts-10.0_r12android-vts-10.0_r11android-vts-10.0_r10android-vts-10.0_r1android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-mainline-10.0.0_r3android-mainline-10.0.0_r2android-mainline-10.0.0_r1android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android-cts-10.0_r12android-cts-10.0_r11android-cts-10.0_r10android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-releaseandroid10-mainline-releaseandroid10-mainline-a-releaseandroid10-gsi
Change-Id: I5cdbd0bb0c35e841ae02a591e1490b9e14cf4944
-rw-r--r-- | manualtest/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | manualtest/build.gradle | 2 | ||||
-rw-r--r-- | src/io/appium/droiddriver/runner/MinSdkVersion.java | 2 | ||||
-rw-r--r-- | src/io/appium/droiddriver/runner/UseUiAutomation.java | 2 | ||||
-rw-r--r-- | src/io/appium/droiddriver/util/ActivityUtils.java | 6 | ||||
-rw-r--r-- | src/io/appium/droiddriver/util/InstrumentationUtils.java | 9 |
6 files changed, 14 insertions, 9 deletions
diff --git a/manualtest/AndroidManifest.xml b/manualtest/AndroidManifest.xml index da5117a..8e874ed 100644 --- a/manualtest/AndroidManifest.xml +++ b/manualtest/AndroidManifest.xml @@ -4,7 +4,7 @@ package="io.appium.droiddriver.manualtest"> <instrumentation - android:name="android.support.test.runner.AndroidJUnitRunner" + android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="io.appium.droiddriver.manualtest" /> <!-- Needed for Android.mk --> diff --git a/manualtest/build.gradle b/manualtest/build.gradle index 22731e4..9eea2d0 100644 --- a/manualtest/build.gradle +++ b/manualtest/build.gradle @@ -16,7 +16,7 @@ android { defaultConfig { minSdkVersion 8 targetSdkVersion 23 - testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner' + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } sourceSets { main { diff --git a/src/io/appium/droiddriver/runner/MinSdkVersion.java b/src/io/appium/droiddriver/runner/MinSdkVersion.java index f560ad8..5a25f8b 100644 --- a/src/io/appium/droiddriver/runner/MinSdkVersion.java +++ b/src/io/appium/droiddriver/runner/MinSdkVersion.java @@ -29,7 +29,7 @@ import java.lang.annotation.Target; * * <p>As any annotations, it is useful only if it is processed by tools. * - * @deprecated Use android.support.test.filters.SdkSuppress instead. + * @deprecated Use androidx.test.filters.SdkSuppress instead. */ @Inherited @Target({TYPE, METHOD}) diff --git a/src/io/appium/droiddriver/runner/UseUiAutomation.java b/src/io/appium/droiddriver/runner/UseUiAutomation.java index e710238..52b48cc 100644 --- a/src/io/appium/droiddriver/runner/UseUiAutomation.java +++ b/src/io/appium/droiddriver/runner/UseUiAutomation.java @@ -31,7 +31,7 @@ import java.lang.annotation.Target; * * <p>As any annotations, it is useful only if it is processed by tools. * - * @deprecated Use android.support.test.filters.SdkSuppress instead. + * @deprecated Use androidx.test.filters.SdkSuppress instead. */ @Inherited @Target({TYPE, METHOD}) diff --git a/src/io/appium/droiddriver/util/ActivityUtils.java b/src/io/appium/droiddriver/util/ActivityUtils.java index ff06ab5..7d7ca7d 100644 --- a/src/io/appium/droiddriver/util/ActivityUtils.java +++ b/src/io/appium/droiddriver/util/ActivityUtils.java @@ -18,9 +18,11 @@ package io.appium.droiddriver.util; import android.app.Activity; import android.os.Looper; -import android.support.test.runner.lifecycle.ActivityLifecycleMonitorRegistry; -import android.support.test.runner.lifecycle.Stage; import android.util.Log; + +import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry; +import androidx.test.runner.lifecycle.Stage; + import java.util.Iterator; import java.util.concurrent.Callable; diff --git a/src/io/appium/droiddriver/util/InstrumentationUtils.java b/src/io/appium/droiddriver/util/InstrumentationUtils.java index 06ac5ab..c6f087e 100644 --- a/src/io/appium/droiddriver/util/InstrumentationUtils.java +++ b/src/io/appium/droiddriver/util/InstrumentationUtils.java @@ -20,10 +20,13 @@ import android.app.Instrumentation; import android.content.Context; import android.os.Bundle; import android.os.Looper; -import android.support.test.InstrumentationRegistry; import android.util.Log; + +import androidx.test.InstrumentationRegistry; + import io.appium.droiddriver.exceptions.DroidDriverException; import io.appium.droiddriver.exceptions.TimeoutException; + import java.util.concurrent.Callable; import java.util.concurrent.Executor; import java.util.concurrent.Executors; @@ -43,7 +46,7 @@ public class InstrumentationUtils { private static long runOnMainSyncTimeoutMillis; /** - * Initializes this class. If you don't use android.support.test.runner.AndroidJUnitRunner or a + * Initializes this class. If you don't use androidx.test.runner.AndroidJUnitRunner or a * runner that supports {link InstrumentationRegistry}, you need to call this method * appropriately. */ @@ -60,7 +63,7 @@ public class InstrumentationUtils { private static synchronized void checkInitialized() { if (instrumentation == null) { - // Assume android.support.test.runner.InstrumentationRegistry is valid + // Assume androidx.test.runner.InstrumentationRegistry is valid init(InstrumentationRegistry.getInstrumentation(), InstrumentationRegistry.getArguments()); } } |