From 4fe9ff343e838c717d05d48a2ad6426fd39d2ca1 Mon Sep 17 00:00:00 2001
From: Heemin Seog <hseog@google.com>
Date: Wed, 17 Mar 2021 16:55:52 -0700
Subject: [PATCH] Add INTERACT_ACROSS_USERS to WMShell

Also add it to privapp permissions for Car Launcher

Bug: 183051101
Test: manual
Change-Id: I9ad7688425c8804eded75865bf3f202bf9ff5cd2
---
 data/etc/car/com.android.car.carlauncher.xml | 1 +
 libs/WindowManager/Shell/AndroidManifest.xml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/data/etc/car/com.android.car.carlauncher.xml b/data/etc/car/com.android.car.carlauncher.xml
index ac16af3484717..abde232a8a5a1 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 d2b3cf6a4fe2a..6bd0e0a4ff860 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>