diff options
| author | 2024-07-23 16:36:19 +0000 | |
|---|---|---|
| committer | 2024-07-23 16:36:19 +0000 | |
| commit | 022f356ed9ea9fcc267aa60b4ac8da9f2a0d2305 (patch) | |
| tree | ed91d4342a78db731b37729ddfbfea57f7ea1fd5 | |
| parent | b00995349445a40d33fb7f1be3ed3ff2f5df31b0 (diff) | |
| parent | 6d71405c37591e057f36e1fd457c9a2251087535 (diff) | |
Merge "Add `android:featureFlag` attribute to the new `CAPTURE_CONSENTLESS_BUGREPORT_ON_USERDEBUG_BUILD` permission." into main
| -rw-r--r-- | core/res/Android.bp | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/core/res/Android.bp b/core/res/Android.bp index a44e92ca4019..9207aa8e9c24 100644 --- a/core/res/Android.bp +++ b/core/res/Android.bp @@ -163,6 +163,7 @@ android_app { "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 9f00d5e08bbf..193836ed9b15 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 --> |