diff options
| author | Ang Li <angli@google.com> | 2019-06-12 17:34:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-12 17:34:15 -0700 |
| commit | b05854810a19da0b698b1c9fa6a9531acdcb8ffb (patch) | |
| tree | 9350d98ee803b59bdc5dc828f2e60bbc19b0670b /src | |
| parent | c2841cf932e00b17dba87ad122546ea1325d2567 (diff) | |
| download | mobly-bundled-snippets-b05854810a19da0b698b1c9fa6a9531acdcb8ffb.tar.gz | |
Handle Wi-Fi permission requirements in Q. (#112)
* Adopt shell permission in Wi-Fi snippet when it's Q.
* Fix ClassNotFound error caused by androidx
Tested locally and confirmed that the change works.
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | src/main/java/com/google/android/mobly/snippet/bundled/WifiManagerSnippet.java | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index c8c987c..b9fde4f 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -20,6 +20,7 @@ <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" /> <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" /> <uses-permission android:name="android.permission.READ_PHONE_STATE" /> <uses-permission android:name="android.permission.READ_PHONE_NUMBERS" /> <uses-permission android:name="android.permission.READ_SMS" /> @@ -29,7 +30,7 @@ <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" /> <uses-permission android:name="android.permission.SEND_SMS" /> <application android:allowBackup="false" - android:name="android.support.multidex.MultiDexApplication"> + android:name="androidx.multidex.MultiDexApplication"> <meta-data android:name="mobly-snippets" android:value="com.google.android.mobly.snippet.bundled.AccountSnippet, diff --git a/src/main/java/com/google/android/mobly/snippet/bundled/WifiManagerSnippet.java b/src/main/java/com/google/android/mobly/snippet/bundled/WifiManagerSnippet.java index 0008c13..3c46708 100644 --- a/src/main/java/com/google/android/mobly/snippet/bundled/WifiManagerSnippet.java +++ b/src/main/java/com/google/android/mobly/snippet/bundled/WifiManagerSnippet.java @@ -62,6 +62,11 @@ public class WifiManagerSnippet implements Snippet { mWifiManager = (WifiManager) mContext.getApplicationContext().getSystemService(Context.WIFI_SERVICE); + if (Build.VERSION.SDK_INT >= 29) { + InstrumentationRegistry.getInstrumentation() + .getUiAutomation() + .adoptShellPermissionIdentity(); + } } @Rpc( |