Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Grant shell permissions for Airplane Mode to Shell to support CTS" am: a8cc70b502 am: d1d3e03659 am: c031e12c7f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539421

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a31950f7409d3a907448b05d334f5888fc06cc5
This commit is contained in:
Etan Cohen
2021-01-05 21:09:27 +00:00
committed by Automerger Merge Worker
parent a162921b8a c031e12c7f
commit f3c551f4a4
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/etc/privapp-permissions-platform.xml
View File

@@ -350,6 +350,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" />

3
packages/Shell/AndroidManifest.xml
View File

@@ -297,6 +297,9 @@
<!-- Permission needed to test mainline permission module rollback -->
<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" />