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

Merge "p2p: add MANAGE_WIFI_AUTO_JOIN permission for CTS external approver tests" am: 2a491d487f am: 7faee6e286

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

Change-Id: Id4e8c1ecf51c89454142c3b8e5f9eed18d076f12
This commit is contained in:
Treehugger Robot
2022-02-16 23:39:34 +00:00
committed by Automerger Merge Worker
parent f112b0226c 7faee6e286
commit 3cf3a321e6
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -464,6 +464,9 @@ applications that come with the platform
<permission name="android.permission.WIFI_UPDATE_COEX_UNSAFE_CHANNELS" />
<permission name="android.permission.NEARBY_WIFI_DEVICES" />
<permission name="android.permission.OVERRIDE_WIFI_CONFIG" />
<!-- Permission needed for CTS test - ConcurrencyTest#testP2pExternalApprover
P2P external approver API sets require MANAGE_WIFI_AUTO_JOIN permission. -->
<permission name="android.permission.MANAGE_WIFI_AUTO_JOIN" />
<!-- Permission required for CTS test CarrierMessagingServiceWrapperTest -->
<permission name="android.permission.BIND_CARRIER_SERVICES"/>
<!-- Permission required for CTS test - MusicRecognitionManagerTest -->

3
packages/Shell/AndroidManifest.xml
View File

@@ -509,6 +509,9 @@
<uses-permission android:name="android.permission.WIFI_UPDATE_COEX_UNSAFE_CHANNELS" />
<uses-permission android:name="android.permission.NEARBY_WIFI_DEVICES" />
<uses-permission android:name="android.permission.OVERRIDE_WIFI_CONFIG" />
<!-- Permission needed for CTS test - ConcurrencyTest#testP2pExternalApprover
P2P external approver API sets require MANAGE_WIFI_AUTO_JOIN permission. -->
<uses-permission android:name="android.permission.MANAGE_WIFI_AUTO_JOIN" />
<!-- Permission required for CTS tests to enable/disable rate limiting toasts. -->
<uses-permission android:name="android.permission.MANAGE_TOAST_RATE_LIMITING" />