diff options
| author | 2021-12-03 00:56:56 +0000 | |
|---|---|---|
| committer | 2021-12-03 00:56:56 +0000 | |
| commit | 00b14576baf95c57e4dc915dfdc00c1f25a39b95 (patch) | |
| tree | e67cbc2624de7d9d7c0e4eb774d88037e0828405 | |
| parent | 56f6d8d8a9deafde378cd88f3cf2c360a7de1af9 (diff) | |
| parent | b4cce59e37197fbbc212c231efb603335ad68a2b (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 e81adecc3bad..1c7659ec0bec 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -503,6 +503,8 @@ applications that come with the platform <permission name="android.permission.UPDATE_DEVICE_STATS" /> <!-- Permission required for GTS test - PendingSystemUpdateTest --> <permission name="android.permission.NOTIFY_PENDING_SYSTEM_UPDATE" /> + <!-- 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 97cc948e134b..87d50f29061f 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -578,6 +578,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" |