diff options
| author | 2021-12-02 23:41:09 +0000 | |
|---|---|---|
| committer | 2021-12-02 23:41:09 +0000 | |
| commit | 0f642cfedfe5d4f9873974cf7d838e4c8d9b0f58 (patch) | |
| tree | 2024077b2d4e78aa6a36f4612825da089a27b6c2 | |
| parent | 4795c7fff5d0e7ece70917c639693c861a3ac3fb (diff) | |
| parent | a07ccbe6566d1e87b6975efb62cc6130816e0b45 (diff) | |
Merge "Add DEVICE_LOCK permission to Shell to support ATS test"
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 2 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index f83f4019840a..0a2670a3b242 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -512,6 +512,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 2b311ee25c31..867ab3cfbc69 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -596,6 +596,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" |