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

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

Merge "Revert "Reset SYSTEM_FIXED flags for hard restricted perms"" into... 

Merge "Revert "Reset SYSTEM_FIXED flags for hard restricted perms"" into qt-dev am: 35e5db7a am: 8bace2d8
am: 3ec3952f

Change-Id: Ibbc50c4675cfe03b0ae72d94c42897d875ac91da
parents 52093f71 3ec3952f

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

                                if (hardRestricted && !restrictionExempt

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

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

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