diff options
| author | 2021-01-05 20:38:35 +0000 | |
|---|---|---|
| committer | 2021-01-05 20:38:35 +0000 | |
| commit | c031e12c7fc0538735dbb7ab8de2ef6bc4f0d01d (patch) | |
| tree | 3140692390096e1b5ffbef94495339bfb0adfe3c | |
| parent | 9209ce0c1930184f2350adc776e7a537beb0cd6c (diff) | |
| parent | d1d3e03659a2285f017e58d9dbf773c3f578cce1 (diff) | |
Merge "Grant shell permissions for Airplane Mode to Shell to support CTS" am: a8cc70b502 am: d1d3e03659
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539421
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia5fb1ea1ca298cd0f4275c42b94d027c9c3c53b7
| -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 1d6355c318ec..e1b24e58d5e3 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -345,6 +345,8 @@ applications that come with the platform <permission name="android.permission.MOUNT_FORMAT_FILESYSTEMS"/> <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/> <permission name="android.permission.MOVE_PACKAGE"/> + <!-- Needed for test only --> + <permission name="android.permission.NETWORK_AIRPLANE_MODE"/> <permission name="android.permission.OBSERVE_APP_USAGE"/> <permission name="android.permission.NETWORK_SCAN"/> <permission name="android.permission.PACKAGE_USAGE_STATS" /> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 0fdb282edc23..ea20be7fd9eb 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -291,6 +291,9 @@ <uses-permission android:name="android.permission.UPGRADE_RUNTIME_PERMISSIONS" /> <!-- Permission needed to read wifi network credentials for CtsNetTestCases --> + <uses-permission android:name="android.permission.NETWORK_AIRPLANE_MODE" /> + + <!-- Permission needed to read wifi network credentials for CtsNetTestCases --> <uses-permission android:name="android.permission.READ_WIFI_CREDENTIAL" /> <!-- Permission needed to use wifi usability API's for CtsNetTestCases --> |