diff options
| author | 2021-03-22 20:53:04 +0000 | |
|---|---|---|
| committer | 2021-03-22 20:53:04 +0000 | |
| commit | 0cc4fd9db813cf97e0d22512d537fd638f14139a (patch) | |
| tree | 43bcc93983aac8cbdb423e0df7b44b33aa0c1e36 | |
| parent | a8d563cf30fd2b1eed07a8b34bac6cfa94711b8f (diff) | |
| parent | 4fe9ff343e838c717d05d48a2ad6426fd39d2ca1 (diff) | |
Merge "Add INTERACT_ACROSS_USERS to WMShell" into sc-dev
| -rw-r--r-- | data/etc/car/com.android.car.carlauncher.xml | 1 | ||||
| -rw-r--r-- | libs/WindowManager/Shell/AndroidManifest.xml | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/data/etc/car/com.android.car.carlauncher.xml b/data/etc/car/com.android.car.carlauncher.xml index ac16af348471..abde232a8a5a 100644 --- a/data/etc/car/com.android.car.carlauncher.xml +++ b/data/etc/car/com.android.car.carlauncher.xml @@ -18,6 +18,7 @@ <privapp-permissions package="com.android.car.carlauncher"> <permission name="android.permission.ACTIVITY_EMBEDDING"/> <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/> + <permission name="android.permission.INTERACT_ACROSS_USERS"/> <permission name="android.permission.MANAGE_USERS"/> <permission name="android.permission.MEDIA_CONTENT_CONTROL"/> <permission name="android.permission.PACKAGE_USAGE_STATS"/> diff --git a/libs/WindowManager/Shell/AndroidManifest.xml b/libs/WindowManager/Shell/AndroidManifest.xml index d2b3cf6a4fe2..6bd0e0a4ff86 100644 --- a/libs/WindowManager/Shell/AndroidManifest.xml +++ b/libs/WindowManager/Shell/AndroidManifest.xml @@ -17,6 +17,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.wm.shell"> + <!-- System permission required by WM Shell Task Organizer. --> + <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" /> <uses-permission android:name="android.permission.ROTATE_SURFACE_FLINGER" /> <uses-permission android:name="android.permission.READ_FRAME_BUFFER" /> </manifest> |