summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Anthony Hugh <ahugh@google.com> 2021-11-16 11:23:26 -0800
committer Anthony Hugh <ahugh@google.com> 2021-11-22 14:10:11 -0800
commita07ccbe6566d1e87b6975efb62cc6130816e0b45 (patch)
tree5fffab3603f7e7353a40f1eb687a7ef87fc7d697
parent905e6afba18ab3e39e53d3866237f3046bde1301 (diff)
Add DEVICE_LOCK permission to Shell to support ATS test
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
-rw-r--r--data/etc/privapp-permissions-platform.xml2
-rw-r--r--packages/Shell/AndroidManifest.xml3
2 files changed, 5 insertions, 0 deletions
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 103b836ae237..1392b7c20703 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -507,6 +507,8 @@ applications that come with the platform
<permission name="android.permission.NOTIFY_PENDING_SYSTEM_UPDATE" />
<!-- Permission required for GTS test - GtsAssistIntentTestCases -->
<permission name="android.permission.MANAGE_VOICE_KEYPHRASES" />
+ <!-- Permission required for ATS test - CarDevicePolicyManagerTest -->
+ <permission name="android.permission.LOCK_DEVICE" />
</privapp-permissions>
<privapp-permissions package="com.android.statementservice">
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index abd010db7cee..ff37702c7fa9 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -592,6 +592,9 @@
<!-- Permission required for CTS test - SettingsMultiPaneDeepLinkTest -->
<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"
android:theme="@android:style/Theme.DeviceDefault.DayNight"
android:defaultToDeviceProtectedStorage="true"