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

[RESTRICT AUTOMERGE] Fix the inconsistency of protection level am: b5efdf7293

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16531386

Change-Id: I9c1ffc3bdba6e40ba32be04ada50ffc82892a62c
This commit is contained in:
Jackal Guo
2022-01-12 01:53:19 +00:00
committed by Automerger Merge Worker
parent 120d0e7ae7 b5efdf7293
commit c1826ef1b4
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/permission/BasePermission.java
View File

@@ -409,6 +409,8 @@ public final class BasePermission {
} }
if (bp.perm != null && Objects.equals(bp.perm.getPackageName(), p.getPackageName()) if (bp.perm != null && Objects.equals(bp.perm.getPackageName(), p.getPackageName())
&& Objects.equals(bp.perm.getName(), p.getName())) { && Objects.equals(bp.perm.getName(), p.getName())) {
bp.perm.setFlags(bp.perm.getFlags() & ~PermissionInfo.FLAG_INSTALLED);
bp.perm = p.setFlags(p.getFlags() | PermissionInfo.FLAG_INSTALLED);
bp.protectionLevel = p.getProtectionLevel(); bp.protectionLevel = p.getProtectionLevel();
} }
if (bp.isRuntime() && (ownerChanged || wasNonRuntime)) { if (bp.isRuntime() && (ownerChanged || wasNonRuntime)) {