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

Commit 250b2b99 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge "Reset SYSTEM_FIXED flags for hard restricted perms" into qt-dev am:... 

Merge "Reset SYSTEM_FIXED flags for hard restricted perms" into qt-dev am: 164404bf am: caf3e956
am: fd0b4a0b

Change-Id: Idf95150fc54ed7d38278b58b8f05d9af71b3f26b
parents a176bda8 fd0b4a0b

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

+1 −1
Original line number Diff line number Diff line
@@ -1178,7 +1178,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.