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

Commit 3c2731fd authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Reset SYSTEM_FIXED flags for hard restricted perms 

So that incorrectly SYSTEM_FIXED / denied permissions will be able to
get regrated via the default permission grant policy

This can be removed after all devices have been fixed

Test: Got system into the state with SYSTEM_FIXED / denied permission
      and then silulated an OTA with this change
Bug: 134069814
Bug: 134161027

Change-Id: I7bc986f0d3e69dd60a017f16867182163fd6eecb
parent 6a59bbe2

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

+1 −1
Original line number Diff line number Diff line
@@ -1173,7 +1173,7 @@ public class PermissionManagerService { 
                                    }

                                }



                                if (hardRestricted && !restrictionExempt

                                if (hardRestricted

                                        && (flags & FLAG_PERMISSION_SYSTEM_FIXED) != 0) {

                                    // Applying a hard restriction implies revoking it. This might

                                    // lead to a system-fixed, revoked permission.