diff options
| author | 2020-02-29 23:42:23 +0000 | |
|---|---|---|
| committer | 2020-02-29 23:42:23 +0000 | |
| commit | 5dbabb62a61ccf068bff032d7db0f8c13842b34c (patch) | |
| tree | f1466204054a0d7d59066ba8749e353ab691827c | |
| parent | d03d6628e4d79c3ccf48c714d7814c2c7af52380 (diff) | |
| parent | 1460b76a02e6b22ebf79f0ab177a3061efdf517f (diff) | |
Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 2 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 78c7b76d38da..73d9cc06a748 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -386,6 +386,8 @@ applications that come with the platform <permission name="android.permission.ACCESS_VIBRATOR_STATE"/> <!-- Permission required for UsageStatsTest CTS test. --> <permission name="android.permission.MANAGE_NOTIFICATIONS"/> + <!-- Permission required for CompanionDeviceManager CTS test. --> + <permission name="android.permission.COMPANION_APPROVE_WIFI_CONNECTIONS" /> </privapp-permissions> <privapp-permissions package="com.android.statementservice"> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 99f8c7dca44f..56d5de473bfc 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -192,7 +192,10 @@ <uses-permission android:name="android.permission.READ_CLIPBOARD_IN_BACKGROUND" /> <!-- Permission needed to wipe the device for Test Harness Mode --> <uses-permission android:name="android.permission.ENABLE_TEST_HARNESS_MODE" /> + + <!-- Permissions required to test CompanionDeviceManager teses in CTS --> <uses-permission android:name="android.permission.MANAGE_COMPANION_DEVICES" /> + <uses-permission android:name="android.permission.COMPANION_APPROVE_WIFI_CONNECTIONS" /> <uses-permission android:name="android.permission.MANAGE_APPOPS" /> |