diff options
| author | 2023-07-26 18:06:00 +0000 | |
|---|---|---|
| committer | 2023-07-26 18:06:00 +0000 | |
| commit | 5e4a01c44b47e9a373db5b1d7046548b51b08658 (patch) | |
| tree | 6a437e62269d11fbe16e38fa691728eafc07ab06 | |
| parent | 253d93367606da9e5d42c2e3b7a83eb0840d161a (diff) | |
| parent | 969a52a60344a9c22e5a107f935a2dfc7544f16e (diff) | |
Merge "Prevent some key system applications from losing storage permissions" into main am: 969a52a603
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2673055
Change-Id: I78b4887496e31d871faad0181949d4878af6225e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java index 9ed5aa7158ab..5221cfa85a7c 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java @@ -2116,6 +2116,12 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt if (!isStorageOrMedia) { continue; } + boolean isSystemOrPolicyFixed = (getPermissionFlags(newPackage.getPackageName(), + permInfo.name, userId) & (FLAG_PERMISSION_SYSTEM_FIXED + | FLAG_PERMISSION_POLICY_FIXED)) != 0; + if (isSystemOrPolicyFixed) { + continue; + } EventLog.writeEvent(0x534e4554, "171430330", newPackage.getUid(), "Revoking permission " + permInfo.name + " from package " |