commit 7d9e3773e441d73f8c618358d8bcd33f71291783
author Manjeet Rulhania <mrulhania@google.com> Wed Mar 13 23:21:18 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 13 23:21:18 2024 +0000
tree 026b120de1256c27ab537388587ef498a3e9a35a
parent 29731fc5eeca717a9fa9bf529d4a16e114e8cdf1
parent 5710c64433595d04910bfce79c3cf8bfad7fde50

Merge "Add featureFlag attribute for new RECORD_SENSITIVE_CONTENT permission" into main

core/res/Android.bp

diff --git a/core/res/Android.bp b/core/res/Android.bp
index e2e419f..79b1376 100644
--- a/core/res/Android.bp
+++ b/core/res/Android.bp
@@ -161,6 +161,7 @@
         "camera_platform_flags",
         "android.net.platform.flags-aconfig",
         "com.android.window.flags.window-aconfig",
+        "android.permission.flags-aconfig",
     ],
 }
 

core/res/AndroidManifest.xml

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 0664211..0869af5 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -6920,7 +6920,8 @@
          projection. This is intended for on device screen recording system app.
          @FlaggedApi("android.permission.flags.sensitive_notification_app_protection") -->
     <permission android:name="android.permission.RECORD_SENSITIVE_CONTENT"
-                android:protectionLevel="signature"/>
+        android:protectionLevel="signature"
+        android:featureFlag="android.permission.flags.sensitive_notification_app_protection"/>
 
     <!-- @SystemApi Allows an application to read install sessions
          @hide This is not a third-party API (intended for system apps). -->