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

Merge "Add OVERRIDE_WIFI_CONFIG permission to Shell for CTS" am: dbe634a784

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

Change-Id: I5b8abd45829d7547d094714442015c52ab0472e4
This commit is contained in:
Nate(Qiang) Jiang
2022-01-26 20:44:00 +00:00
committed by Automerger Merge Worker
parent 0a3cb5df0a dbe634a784
commit 93be545cde
2 changed files with 2 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

@@ -461,6 +461,7 @@ applications that come with the platform
<!-- Permission needed for CTS test - WifiManagerTest --> <!-- Permission needed for CTS test - WifiManagerTest -->
<permission name="android.permission.WIFI_ACCESS_COEX_UNSAFE_CHANNELS" /> <permission name="android.permission.WIFI_ACCESS_COEX_UNSAFE_CHANNELS" />
<permission name="android.permission.WIFI_UPDATE_COEX_UNSAFE_CHANNELS" /> <permission name="android.permission.WIFI_UPDATE_COEX_UNSAFE_CHANNELS" />
<permission name="android.permission.OVERRIDE_WIFI_CONFIG" />
<!-- 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 -->

1
packages/Shell/AndroidManifest.xml
View File

@@ -504,6 +504,7 @@
<!-- Permission needed for CTS test - WifiManagerTest --> <!-- Permission needed for CTS test - WifiManagerTest -->
<uses-permission android:name="android.permission.WIFI_ACCESS_COEX_UNSAFE_CHANNELS" /> <uses-permission android:name="android.permission.WIFI_ACCESS_COEX_UNSAFE_CHANNELS" />
<uses-permission android:name="android.permission.WIFI_UPDATE_COEX_UNSAFE_CHANNELS" /> <uses-permission android:name="android.permission.WIFI_UPDATE_COEX_UNSAFE_CHANNELS" />
<uses-permission android:name="android.permission.OVERRIDE_WIFI_CONFIG" />
<!-- 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" />