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

Commit 7839a19f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't remove SYSTEM_FIXED for intentional fixed grants to critical... 

Merge "Don't remove SYSTEM_FIXED for intentional fixed grants to critical apps." into sc-v2-dev am: 238c6d65

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16549700

Change-Id: I39142a3cbd0587e6e64363ff94f04e3849593b7f
parents 637ebd35 238c6d65

services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java

+2 −1
Original line number Diff line number Diff line
@@ -435,7 +435,8 @@ final class DefaultPermissionGrantPolicy { 
                    || !pm.isGranted(Manifest.permission.READ_PRIVILEGED_PHONE_STATE,

                            pkg, UserHandle.of(userId))

                    || !pm.isGranted(Manifest.permission.READ_PHONE_STATE, pkg,

                            UserHandle.of(userId))) {

                            UserHandle.of(userId))

                    || pm.isSysComponentOrPersistentPlatformSignedPrivApp(pkg)) {

                continue;

            }