Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-31 21:22:44 +00:00
committed by Android (Google) Code Review
parent 5c9415dd1a 6a59bbe2be
commit ed225f65b0
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/pm/permission/PermissionManagerService.java
View File

@@ -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) { if (wasChanged) {
updatedUserIds = ArrayUtils.appendInt(updatedUserIds, userId); updatedUserIds = ArrayUtils.appendInt(updatedUserIds, userId);
} }