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

Commit 513cf02d authored by Becky Siegel's avatar Becky Siegel Committed by Android (Google) Code Review
Browse files

Merge "Revert "Change default mode for ACCESS_NOTIFICATIONS"" into main

parents 4116768d dee19473

core/java/android/app/AppOpsManager.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -2685,7 +2685,8 @@ public class AppOpsManager { 
            .setDefaultMode(getSystemAlertWindowDefault()).build(),

            .setDefaultMode(getSystemAlertWindowDefault()).build(),

        new AppOpInfo.Builder(OP_ACCESS_NOTIFICATIONS, OPSTR_ACCESS_NOTIFICATIONS,

        new AppOpInfo.Builder(OP_ACCESS_NOTIFICATIONS, OPSTR_ACCESS_NOTIFICATIONS,

                "ACCESS_NOTIFICATIONS")

                "ACCESS_NOTIFICATIONS")

            .setPermission(android.Manifest.permission.ACCESS_NOTIFICATIONS).build(),

            .setPermission(android.Manifest.permission.ACCESS_NOTIFICATIONS)

            .setDefaultMode(AppOpsManager.MODE_ALLOWED).build(),

        new AppOpInfo.Builder(OP_CAMERA, OPSTR_CAMERA, "CAMERA")

        new AppOpInfo.Builder(OP_CAMERA, OPSTR_CAMERA, "CAMERA")

            .setPermission(android.Manifest.permission.CAMERA)

            .setPermission(android.Manifest.permission.CAMERA)

            .setRestriction(UserManager.DISALLOW_CAMERA)

            .setRestriction(UserManager.DISALLOW_CAMERA)