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

Add DEVICE_LOCK permission to Shell to support ATS test

Browse Source 
Adds DEVICE_LOCK permission to Shell to support the
CarDevicePolicyManagerTest. This permission is needed to call
DevicePolicyManager#lockNow  which locks the device.

Bug: 187199256
Test: atest CarDevicePolicyManagerTest
Change-Id: I3fa20b53b929c97a6760d65b432a74c3415d6a08
This commit is contained in:
Anthony Hugh
2021-11-16 11:23:26 -08:00
parent 905e6afba1
commit a07ccbe656
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -507,6 +507,8 @@ applications that come with the platform
<permission name="android.permission.NOTIFY_PENDING_SYSTEM_UPDATE" /> <permission name="android.permission.NOTIFY_PENDING_SYSTEM_UPDATE" />
<!-- Permission required for GTS test - GtsAssistIntentTestCases --> <!-- Permission required for GTS test - GtsAssistIntentTestCases -->
<permission name="android.permission.MANAGE_VOICE_KEYPHRASES" /> <permission name="android.permission.MANAGE_VOICE_KEYPHRASES" />
<!-- Permission required for ATS test - CarDevicePolicyManagerTest -->
<permission name="android.permission.LOCK_DEVICE" />
</privapp-permissions> </privapp-permissions>
<privapp-permissions package="com.android.statementservice"> <privapp-permissions package="com.android.statementservice">

3
packages/Shell/AndroidManifest.xml
View File

@@ -592,6 +592,9 @@
<!-- Permission required for CTS test - SettingsMultiPaneDeepLinkTest --> <!-- Permission required for CTS test - SettingsMultiPaneDeepLinkTest -->
<uses-permission android:name="android.permission.LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK" /> <uses-permission android:name="android.permission.LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK" />
<!-- Permission required for ATS test - CarDevicePolicyManagerTest -->
<uses-permission android:name="android.permission.LOCK_DEVICE" />
<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"