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

Commit b0b28634 authored by Hai Zhang's avatar Hai Zhang
Browse files

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

See b/208785537#comment11.

Bug: 208785537
Bug: 206556385
Bug: 183537857
Fixes: 203175819
Test: presubmit
Change-Id: Iaf5e2a0d86259805a9ef03f8f1baa14dd8c58da0
Merged-In: Iaf5e2a0d86259805a9ef03f8f1baa14dd8c58da0
(cherry picked from commit e6f07a4f)
parent f1cd6678

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

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

            }