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

Merge "Add NEARBY_WIFI_DEVICES to shell permissions for CTS" am: 5d4effbd23 am: e4ee7f0e2e am: c144be7ef4

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

Change-Id: Idad3bf93fcf515927e5fa980206873d0b7adec18
This commit is contained in:
Treehugger Robot
2022-02-03 02:23:26 +00:00
committed by Automerger Merge Worker
parent 88cafc0747 c144be7ef4
commit 0ff22a2817
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.NEARBY_WIFI_DEVICES" />
<permission name="android.permission.OVERRIDE_WIFI_CONFIG" /> <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"/>

1
packages/Shell/AndroidManifest.xml
View File

@@ -507,6 +507,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.NEARBY_WIFI_DEVICES" />
<uses-permission android:name="android.permission.OVERRIDE_WIFI_CONFIG" /> <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. -->