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

Merge "p2p: add CONFIGURE_WIFI_DISPLAY permssion for P2P test" am: 1bf4072c78 am: a29505af31

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

Change-Id: Id14c36a6cdfc6b01e97846c38238f14fc231cfe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jimmy Chen
2022-06-16 01:44:21 +00:00
committed by Automerger Merge Worker
parent b8e3ad6eae a29505af31
commit a6b28ca5eb
2 changed files with 4 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

@@ -427,6 +427,8 @@ applications that come with the platform
<!-- Permission needed for CTS test - ConcurrencyTest#testP2pExternalApprover <!-- Permission needed for CTS test - ConcurrencyTest#testP2pExternalApprover
P2P external approver API sets require MANAGE_WIFI_NETWORK_SELECTION permission. --> P2P external approver API sets require MANAGE_WIFI_NETWORK_SELECTION permission. -->
<permission name="android.permission.MANAGE_WIFI_NETWORK_SELECTION" /> <permission name="android.permission.MANAGE_WIFI_NETWORK_SELECTION" />
<!-- Permission needed for CTS test - ConcurrencyTest#testP2pSetWfdInfo -->
<permission name="android.permission.CONFIGURE_WIFI_DISPLAY" />
<!-- Permission required for CTS test CarrierMessagingServiceWrapperTest --> <!-- Permission required for CTS test CarrierMessagingServiceWrapperTest -->
<permission name="android.permission.BIND_CARRIER_SERVICES"/> <permission name="android.permission.BIND_CARRIER_SERVICES"/>
<!-- Permission required for CTS test - MusicRecognitionManagerTest --> <!-- Permission required for CTS test - MusicRecognitionManagerTest -->

2
packages/Shell/AndroidManifest.xml
View File

@@ -552,6 +552,8 @@
<!-- Permission needed for CTS test - ConcurrencyTest#testP2pExternalApprover <!-- Permission needed for CTS test - ConcurrencyTest#testP2pExternalApprover
P2P external approver API sets require MANAGE_WIFI_NETWORK_SELECTION permission. --> P2P external approver API sets require MANAGE_WIFI_NETWORK_SELECTION permission. -->
<uses-permission android:name="android.permission.MANAGE_WIFI_NETWORK_SELECTION" /> <uses-permission android:name="android.permission.MANAGE_WIFI_NETWORK_SELECTION" />
<!-- Permission needed for CTS test - ConcurrencyTest#testP2pSetWfdInfo -->
<uses-permission android:name="android.permission.CONFIGURE_WIFI_DISPLAY" />
<!-- Permission required for CTS tests to enable/disable rate limiting toasts. --> <!-- Permission required for CTS tests to enable/disable rate limiting toasts. -->
<uses-permission android:name="android.permission.MANAGE_TOAST_RATE_LIMITING" /> <uses-permission android:name="android.permission.MANAGE_TOAST_RATE_LIMITING" />