summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vladimir Komsiyski <vladokom@google.com> 2025-03-20 13:55:42 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2025-03-20 13:55:42 -0700
commitc8296e596acd760941c467f2688b99ca4ca17ce1 (patch)
treea6ea48de52dc565877b78e3384f6043cf78e1eb7
parentc1ce5453871c188be8941a17dde3a43f02d81d0c (diff)
parentbc2f8d82a9c15093ca84b8078fc5687c5983f9e7 (diff)
Merge "Rename the limited VDM role and permission" into main
-rw-r--r--PermissionController/res/xml/roles.xml3
-rw-r--r--tests/cts/permissionpolicy/res/raw/android_manifest.xml4
2 files changed, 4 insertions, 3 deletions
diff --git a/PermissionController/res/xml/roles.xml b/PermissionController/res/xml/roles.xml
index 4ba524462..41eaf8b6e 100644
--- a/PermissionController/res/xml/roles.xml
+++ b/PermissionController/res/xml/roles.xml
@@ -1938,7 +1938,8 @@
</role>
<role
- name="android.app.role.COMPANION_DEVICE_SENSOR_DEVICE_STREAMING"
+ name="android.app.role.COMPANION_DEVICE_VIRTUAL_DEVICE"
+ allowBypassingQualification="true"
exclusive="false"
exclusivity="none"
featureFlag="android.companion.virtualdevice.flags.Flags.enableLimitedVdmRole"
diff --git a/tests/cts/permissionpolicy/res/raw/android_manifest.xml b/tests/cts/permissionpolicy/res/raw/android_manifest.xml
index 4476d934b..200e3cf42 100644
--- a/tests/cts/permissionpolicy/res/raw/android_manifest.xml
+++ b/tests/cts/permissionpolicy/res/raw/android_manifest.xml
@@ -4554,12 +4554,12 @@
android:protectionLevel="signature|privileged" />
<!-- Allows application to request to stream content from an Android host to a nearby device
- ({@link android.companion.AssociationRequest#DEVICE_PROFILE_SENSOR_DEVICE_STREAMING})
+ ({@link android.companion.AssociationRequest#DEVICE_PROFILE_VIRTUAL_DEVICE})
by {@link android.companion.CompanionDeviceManager}.
<p>Not for use by third-party applications.
@FlaggedApi(android.companion.virtualdevice.flags.Flags.FLAG_ENABLE_LIMITED_VDM_ROLE)
-->
- <permission android:name="android.permission.REQUEST_COMPANION_PROFILE_SENSOR_DEVICE_STREAMING"
+ <permission android:name="android.permission.REQUEST_COMPANION_PROFILE_VIRTUAL_DEVICE"
android:protectionLevel="signature|privileged"
android:featureFlag="android.companion.virtualdevice.flags.enable_limited_vdm_role" />