Merge "Add `android:featureFlag` attribute to the new `CAPTURE_CONSENTLESS_BUGREPORT_ON_USERDEBUG_BUILD` permission." into main
diff --git a/core/res/Android.bp b/core/res/Android.bp
index a44e92c..9207aa8 100644
--- a/core/res/Android.bp
+++ b/core/res/Android.bp
@@ -163,6 +163,7 @@
"android.net.platform.flags-aconfig",
"com.android.window.flags.window-aconfig",
"android.permission.flags-aconfig",
+ "android.os.flags-aconfig",
],
}
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 9f00d5e..193836e 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -8243,7 +8243,8 @@
<p>Not for use by third-party applications. -->
<permission
android:name="android.permission.CAPTURE_CONSENTLESS_BUGREPORT_DELEGATED_CONSENT"
- android:protectionLevel="signature|privileged" />
+ android:protectionLevel="signature|privileged"
+ android:featureFlag="android.os.allow_consentless_bugreport_delegated_consent" />
<!-- @SystemApi Allows to call APIs that log process lifecycle events
@hide -->