commit 990e3429636382175ca8e7bf04df054f48fbd130
author Maurice Lam <yukl@google.com> Fri Jan 14 20:44:48 2022 -0800
committer Maurice Lam <yukl@google.com> Tue Jan 25 10:27:30 2022 -0800
tree e52eafff963043ec1a588cc572b2f2b4d5bec7bf
parent c11852d456d7f718fceac59868442f8f7875507f

Make ADD_TRUSTED_DISPLAY and ADD_ALWAYS_UNLOCKED_DISPLAY "role"

These 2 permissions are needed for app streaming, so add them to the
APP_STREAMING role. They are also added to the Shell for CTS testing.

Fixes: 205062006
Bug: 204606917
Test: ag/16633813
Change-Id: I66903ba11694e1a57aecf1a12ed1f7e0f6eab811
Ignore-AOSP-First: Permissions are for features not in AOSP yet

packages/Shell/AndroidManifest.xml

diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 46e24fa..251ab07 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -203,7 +203,6 @@
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
     <uses-permission android:name="android.permission.CREATE_USERS" />
     <uses-permission android:name="android.permission.QUERY_USERS" />
-    <uses-permission android:name="android.permission.CREATE_VIRTUAL_DEVICE" />
     <uses-permission android:name="android.permission.MANAGE_CREDENTIAL_MANAGEMENT_APP" />
     <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />
     <uses-permission android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS" />
@@ -624,6 +623,11 @@
     <uses-permission android:name="android.permission.READ_SAFETY_CENTER_STATUS" />
     <uses-permission android:name="android.permission.MANAGE_SAFETY_CENTER" />
 
+    <!-- Permissions required for CTS test - CtsVirtualDevicesTestCases -->
+    <uses-permission android:name="android.permission.CREATE_VIRTUAL_DEVICE" />
+    <uses-permission android:name="android.permission.ADD_TRUSTED_DISPLAY" />
+    <uses-permission android:name="android.permission.ADD_ALWAYS_UNLOCKED_DISPLAY" />
+
 
     <!-- Permission required for CTS test - Notification test suite -->
     <uses-permission android:name="android.permission.REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL" />