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

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

Merge "Remove the check that excludes Telephony bug report mode from being... 

Merge "Remove the check that excludes Telephony bug report mode from being consentless, since the newly added premission is not meant to bypass consent entirely, but instead using the system apps' own consent every time a bug report is generated." into main
parents 733ee15e 504babfe

services/core/java/com/android/server/incident/PendingReports.java

+6 −10
Original line number Diff line number Diff line
@@ -324,16 +324,12 @@ class PendingReports { 


        // Allow system apps to skip the consent dialog and use their in-built consent mechanism

        // instead.

        boolean captureConsentlessBugreportDelegatedConsentGranted = false;

        if ((flags & IncidentManager.FLAG_ALLOW_CONSENTLESS_BUGREPORT) != 0) {

            captureConsentlessBugreportDelegatedConsentGranted =

        boolean captureConsentlessBugreportDelegatedConsentGranted =

                mPermissionManager.checkPermissionForDataDelivery(

                                    Manifest.permission

                                            .CAPTURE_CONSENTLESS_BUGREPORT_DELEGATED_CONSENT,

                        Manifest.permission.CAPTURE_CONSENTLESS_BUGREPORT_DELEGATED_CONSENT,

                        attributionSource,

                        /* message= */ null)

                        == PERMISSION_GRANTED;

        }



        if (captureConsentlessBugreportOnUserdebugBuildGranted

                || captureConsentlessBugreportDelegatedConsentGranted) {