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

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

Merge "Don't create system fixed, revoked permissions" into qt-dev 

am: ed225f65

Change-Id: Ibad71567b0b0e7984cf5a4de2726edc7dbde5a28
parents 19c8df25 ed225f65

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

+8 −0
Original line number Diff line number Diff line
@@ -1173,6 +1173,14 @@ public class PermissionManagerService { 
                                    }

                                }



                                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.

                                    flags &= ~FLAG_PERMISSION_SYSTEM_FIXED;

                                    wasChanged = true;

                                }



                                if (wasChanged) {

                                    updatedUserIds = ArrayUtils.appendInt(updatedUserIds, userId);

                                }