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

Merge "Add wifi coex permissions to Shell for CTS tests" am: c7dfd602ee am: 50b86c5fb3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I148fffadc82704d4f4c508f880c2a39fe7e37f89
This commit is contained in:
Quang Luong
2021-01-06 19:55:22 +00:00
committed by Automerger Merge Worker
parent deb3fc814c 50b86c5fb3
commit 21b3306247
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -442,6 +442,9 @@ applications that come with the platform
<permission name="android.permission.MANAGE_TIME_AND_ZONE_DETECTION" /> <permission name="android.permission.MANAGE_TIME_AND_ZONE_DETECTION" />
<!-- Permissions required for CTS test - CtsHdmiCecHostTestCases --> <!-- Permissions required for CTS test - CtsHdmiCecHostTestCases -->
<permission name="android.permission.HDMI_CEC"/> <permission name="android.permission.HDMI_CEC"/>
<!-- Permission needed for CTS test - WifiManagerTest -->
<permission name="android.permission.WIFI_ACCESS_COEX_UNSAFE_CHANNELS" />
<permission name="android.permission.WIFI_UPDATE_COEX_UNSAFE_CHANNELS" />
</privapp-permissions> </privapp-permissions>
<privapp-permissions package="com.android.statementservice"> <privapp-permissions package="com.android.statementservice">

4
packages/Shell/AndroidManifest.xml
View File

@@ -340,6 +340,10 @@
<!-- Permission needed for CTS test - CtsHdmiCecHostTestCases --> <!-- Permission needed for CTS test - CtsHdmiCecHostTestCases -->
<uses-permission android:name="android.permission.HDMI_CEC" /> <uses-permission android:name="android.permission.HDMI_CEC" />
<!-- Permission needed for CTS test - WifiManagerTest -->
<uses-permission android:name="android.permission.WIFI_ACCESS_COEX_UNSAFE_CHANNELS" />
<uses-permission android:name="android.permission.WIFI_UPDATE_COEX_UNSAFE_CHANNELS" />
<application android:label="@string/app_label" <application android:label="@string/app_label"
android:theme="@android:style/Theme.DeviceDefault.DayNight" android:theme="@android:style/Theme.DeviceDefault.DayNight"
android:defaultToDeviceProtectedStorage="true" android:defaultToDeviceProtectedStorage="true"