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

Merge "Rename MANAGE_WIFI_AUTO_JOIN to MANAGE_WIFI_NETWORK_SELECTION" am: 2349f6f641 am: 64c4227b11 am: c917ab08d9

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

Change-Id: If94a79731f5a7605717e10cf978f9c42b78cea11
This commit is contained in:
Oscar Shu
2022-03-11 01:32:42 +00:00
committed by Automerger Merge Worker
parent 77946e2ae8 c917ab08d9
commit 6793c6fd69
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -454,8 +454,8 @@ applications that come with the platform
<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" />
P2P external approver API sets require MANAGE_WIFI_NETWORK_SELECTION permission. -->
<permission name="android.permission.MANAGE_WIFI_NETWORK_SELECTION" />
<!-- Permission required for CTS test CarrierMessagingServiceWrapperTest -->
<permission name="android.permission.BIND_CARRIER_SERVICES"/>
<!-- Permission required for CTS test - MusicRecognitionManagerTest -->

4
packages/Shell/AndroidManifest.xml
View File

@@ -538,8 +538,8 @@
<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" />
P2P external approver API sets require MANAGE_WIFI_NETWORK_SELECTION permission. -->
<uses-permission android:name="android.permission.MANAGE_WIFI_NETWORK_SELECTION" />
<!-- Permission required for CTS tests to enable/disable rate limiting toasts. -->
<uses-permission android:name="android.permission.MANAGE_TOAST_RATE_LIMITING" />