Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 022f356e authored by Sandy Wiraatmadja's avatar Sandy Wiraatmadja Committed by Android (Google) Code Review
Browse files

Merge "Add `android:featureFlag` attribute to the new... 

Merge "Add `android:featureFlag` attribute to the new `CAPTURE_CONSENTLESS_BUGREPORT_ON_USERDEBUG_BUILD` permission." into main
parents b0099534 6d71405c

core/res/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -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",

    ],

}

core/res/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -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 -->