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

Merge changes I0eb0362e,Iec9b579d am: 6c0e8ad627 am: 1e9a56a83f am: 59b4925437

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ed7e75d5d51ddb7d3f18917eedddc292d83cf5f
This commit is contained in:
Etan Cohen
2021-01-28 06:49:16 +00:00
committed by Automerger Merge Worker
parent e95f58c7bd 59b4925437
commit 258ae119c9
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -354,6 +354,7 @@ applications that come with the platform
<permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
<permission name="android.permission.MOVE_PACKAGE"/>
<!-- Needed for test only -->
<permission name="android.permission.RESTART_WIFI_SUBSYSTEM"/>
<permission name="android.permission.NETWORK_AIRPLANE_MODE"/>
<permission name="android.permission.OBSERVE_APP_USAGE"/>
<permission name="android.permission.NETWORK_SCAN"/>

3
packages/Shell/AndroidManifest.xml
View File

@@ -300,6 +300,9 @@
<!-- Permission needed to test mainline permission module rollback -->
<uses-permission android:name="android.permission.UPGRADE_RUNTIME_PERMISSIONS" />
<!-- Permission needed to restart WiFi Subsystem -->
<uses-permission android:name="android.permission.RESTART_WIFI_SUBSYSTEM" />
<!-- Permission needed to read wifi network credentials for CtsNetTestCases -->
<uses-permission android:name="android.permission.NETWORK_AIRPLANE_MODE" />