commit 66fec94bbb3a4f944662c028ef2f8701d41fe145
author Vladimir Komsiyski <vladokom@google.com> Mon Jan 27 04:45:08 2025 -0800
committer Vladimir Komsiyski <vladokom@google.com> Tue Jan 28 09:11:44 2025 +0100
tree b94a63ac0502f435b29761d5638dbc435165af46
parent ab4eafb6358ce89446f671d919892eb9791bdfae

Add the VDM permissions to shell

So tests can rely on them instead of the roles

Fix: 391599603
Test: presubmit
Flag: EXEMPT test improvement
Change-Id: I1deb60e799174ed63bb483b8d3fe91bb97f1731d

packages/Shell/Android.bp

diff --git a/packages/Shell/Android.bp b/packages/Shell/Android.bp
index 5fdf045..c0c1912 100644
--- a/packages/Shell/Android.bp
+++ b/packages/Shell/Android.bp
@@ -29,6 +29,7 @@
         "device_policy_aconfig_flags_lib",
     ],
     flags_packages: [
+        "android.companion.virtualdevice.flags-aconfig",
         "android.security.flags-aconfig",
         "android.permission.flags-aconfig",
         "wear_aconfig_declarations",
@@ -55,6 +56,7 @@
     platform_apis: true,
     manifest: "AndroidManifest.xml",
     flags_packages: [
+        "android.companion.virtualdevice.flags-aconfig",
         "android.security.flags-aconfig",
         "android.permission.flags-aconfig",
     ],

packages/Shell/AndroidManifest.xml

diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index a044738..2b4e65f 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -969,6 +969,13 @@
     <uses-permission android:name="android.permission.MANAGE_INTRUSION_DETECTION_STATE"
         android:featureFlag="android.security.afl_api"/>
 
+    <!-- Permissions required for CTS test - CtsVirtualDevicesTestCases -->
+    <uses-permission android:name="android.permission.ASSOCIATE_COMPANION_DEVICES" />
+    <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" />
+    <uses-permission android:name="android.permission.ADD_MIRROR_DISPLAY"
+        android:featureFlag="android.companion.virtualdevice.flags.enable_limited_vdm_role"/>
 
     <!-- Permission required for CTS test - CtsAppTestCases -->
     <uses-permission android:name="android.permission.KILL_UID" />