commit 9d95ba09be2a2bd01353241877a22770c0c53412
author Sergey Nikolaienkov <sergeynv@google.com> Fri Nov 19 13:25:15 2021 +0100
committer Sergey Nikolaienkov <sergeynv@google.com> Wed Nov 24 14:50:49 2021 +0100
tree 2480603cd777c31111279f9a83c3a8ccc40d07fc
parent 400d707d92b21549487380e8823660fcf4270629

Grant Shell CDM permissions

Granting Shell new permissions required for accessing
CompanionDeviceManager APIs (such as
REQUEST_COMPANION_PROFILE_APP_STREAMING,
REQUEST_COMPANION_SELF_MANAGED).
Permissions are needed for running CompanionDeviceManagerTest CTS test
(which utilizes adoptShellPermissionIdentity for accessing the API
protected by the said permissions).

Bug: 194301022
Test: atest CompanionDeviceManagerTest
Ignore-AOSP-First: new permissions (not yet in AOSP)
Change-Id: I2c8469661f3b6de4ee1e2aa37c919bc0ad25ef8f

packages/Shell/AndroidManifest.xml

diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index abd010d..aefe3b7 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -90,7 +90,6 @@
     <uses-permission android:name="android.permission.RESTART_PACKAGES" />
     <uses-permission android:name="android.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND" />
     <uses-permission android:name="android.permission.REQUEST_COMPANION_USE_DATA_IN_BACKGROUND" />
-    <uses-permission android:name="android.permission.REQUEST_COMPANION_PROFILE_WATCH" />
     <uses-permission android:name="android.permission.HIDE_OVERLAY_WINDOWS" />
     <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
@@ -297,9 +296,13 @@
     <!-- Permission needed to wipe the device for Test Harness Mode -->
     <uses-permission android:name="android.permission.ENABLE_TEST_HARNESS_MODE" />
 
-    <!-- Permissions required to test CompanionDeviceManager teses in CTS -->
-    <uses-permission android:name="android.permission.MANAGE_COMPANION_DEVICES" />
+    <!-- Permission needed for CTS test - CompanionDeviceManagerTest -->
     <uses-permission android:name="android.permission.COMPANION_APPROVE_WIFI_CONNECTIONS" />
+    <uses-permission android:name="android.permission.MANAGE_COMPANION_DEVICES" />
+    <uses-permission android:name="android.permission.REQUEST_COMPANION_PROFILE_APP_STREAMING" />
+    <uses-permission android:name="android.permission.REQUEST_COMPANION_PROFILE_AUTOMOTIVE_PROJECTION" />
+    <uses-permission android:name="android.permission.REQUEST_COMPANION_PROFILE_WATCH" />
+    <uses-permission android:name="android.permission.REQUEST_COMPANION_SELF_MANAGED" />
 
     <uses-permission android:name="android.permission.MANAGE_APPOPS" />
     <uses-permission android:name="android.permission.WATCH_APPOPS" />