summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dennis Kiilerich <dki@google.com> 2024-04-27 00:46:54 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-04-27 00:46:54 +0000
commitea481c695e52632721a9ec51a3cb24f322cb4008 (patch)
treea4d7fff018ef941cabac98207f027e8ec0796e61
parent5d505ea7f1ebaea8f4f4e23de1ef906db224a286 (diff)
parenta7f7fb729dd1da39f530fbb9189297b2c7672caf (diff)
Merge "Remove allowBypassingQualification from automotive projection role and add CAPTURE_SECURE_VIDEO_OUTPUT permission." into main
-rw-r--r--PermissionController/res/xml/roles.xml2
-rw-r--r--tests/cts/permissionpolicy/res/raw/android_manifest.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/PermissionController/res/xml/roles.xml b/PermissionController/res/xml/roles.xml
index 3cb3c1bda..51bc435a0 100644
--- a/PermissionController/res/xml/roles.xml
+++ b/PermissionController/res/xml/roles.xml
@@ -565,7 +565,6 @@
<role
name="android.app.role.SYSTEM_AUTOMOTIVE_PROJECTION"
- allowBypassingQualification="true"
defaultHolders="config_systemAutomotiveProjection"
exclusive="false"
minSdkVersion="31"
@@ -593,6 +592,7 @@
<!-- If this role holder has a NotificationListenerService, let that service receive
notifications with sensitive content unredacted-->
<permission name="android.permission.RECEIVE_SENSITIVE_NOTIFICATIONS" minSdkVersion="35"/>
+ <permission name="android.permission.CAPTURE_SECURE_VIDEO_OUTPUT" minSdkVersion="35" />
</permissions>
</role>
diff --git a/tests/cts/permissionpolicy/res/raw/android_manifest.xml b/tests/cts/permissionpolicy/res/raw/android_manifest.xml
index d2f00d7c0..8f1fd1c77 100644
--- a/tests/cts/permissionpolicy/res/raw/android_manifest.xml
+++ b/tests/cts/permissionpolicy/res/raw/android_manifest.xml
@@ -6199,7 +6199,7 @@
@hide
@removed -->
<permission android:name="android.permission.CAPTURE_SECURE_VIDEO_OUTPUT"
- android:protectionLevel="signature" />
+ android:protectionLevel="signature|role" />
<!-- Allows an application to know what content is playing and control its playback.
<p>Not for use by third-party applications due to privacy of media consumption</p> -->