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

Commit 3ec3952f 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 qt-dev am: 35e5db7a 

am: 8bace2d8

Change-Id: I6671d6e78f1d04820538a46cafcdf261e1b5eb73
parents 939bfe7a 8bace2d8

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

                                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.