diff options
| author | 2022-03-11 00:48:54 +0000 | |
|---|---|---|
| committer | 2022-03-11 00:48:54 +0000 | |
| commit | 64c4227b113ebe345fec6d8546afbe0735945471 (patch) | |
| tree | c1926dcb2213e08b5a84240d544df57944216d0f | |
| parent | 35ccd7326e216d2f351814b4af1fdbd5a051e18a (diff) | |
| parent | 2349f6f6419589bbf0310dc2e7c1a71aa9f1c927 (diff) | |
Merge "Rename MANAGE_WIFI_AUTO_JOIN to MANAGE_WIFI_NETWORK_SELECTION" am: 2349f6f641
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2019225
Change-Id: I2e16340dc061eff221e29534c8b424e0ee4a51b6
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 4 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 82aff6027653..201ab956d31d 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -459,8 +459,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 --> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index ca4dcbbf230e..e6af794a0b48 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -510,8 +510,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" /> |