diff options
author | Ang Li <angli@google.com> | 2019-01-28 17:30:29 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-28 17:30:29 -0800 |
commit | a337f516cdce2882bb2a9661229f92a14d898fe3 (patch) | |
tree | 279a56eba6a65af49f3eccff3061a377a87e4a28 /third_party/sl4a/src | |
parent | e95b40a3249b47bb55de05cc53a25ae679ad9216 (diff) | |
download | mobly-snippet-lib-a337f516cdce2882bb2a9661229f92a14d898fe3.tar.gz |
Migrate to `androidx`. (#101)
Diffstat (limited to 'third_party/sl4a/src')
-rw-r--r-- | third_party/sl4a/src/main/java/com/google/android/mobly/snippet/SnippetRunner.java | 9 | ||||
-rw-r--r-- | third_party/sl4a/src/main/java/com/google/android/mobly/snippet/event/EventSnippet.java | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/SnippetRunner.java b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/SnippetRunner.java index ea1d71f..ed83469 100644 --- a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/SnippetRunner.java +++ b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/SnippetRunner.java @@ -21,7 +21,7 @@ import android.app.NotificationManager; import android.content.Context; import android.os.Bundle; import android.os.Process; -import android.support.test.runner.AndroidJUnitRunner; +import androidx.test.runner.AndroidJUnitRunner; import com.google.android.mobly.snippet.rpc.AndroidProxy; import com.google.android.mobly.snippet.util.EmptyTestClass; import com.google.android.mobly.snippet.util.Log; @@ -34,10 +34,9 @@ import java.util.Locale; * A launcher that starts the snippet server as an instrumentation so that it has access to the * target app's context. * - * <p>We have to extend some subclass of {@link android.test.InstrumentationTestRunner} because - * snippets are launched with 'am instrument'. We're specifically extending {@link - * AndroidJUnitRunner} because Espresso requires being called through it, since it sets up {@link - * android.support.test.InstrumentationRegistry} which Espresso requires. + * <p>We have to extend some subclass of {@link androidx.test.runner.AndroidJUnitRunner} because + * snippets are launched with 'am instrument', and snippet APKs need to access {@link + * androidx.test.platform.app.InstrumentationRegistry}. * * <p>The launch and communication protocol between snippet and client is versionated and reported * as follows: diff --git a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/event/EventSnippet.java b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/event/EventSnippet.java index 05e044c..4cebb74 100644 --- a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/event/EventSnippet.java +++ b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/event/EventSnippet.java @@ -16,7 +16,7 @@ package com.google.android.mobly.snippet.event; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.google.android.mobly.snippet.Snippet; import com.google.android.mobly.snippet.rpc.Rpc; import java.util.ArrayList; |