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

Merge "Completely fill in permission info" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-04 23:39:39 +00:00
committed by Android (Google) Code Review
parent 53a77b615c a0ec24cb62
commit fdc891e2af
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -411,17 +411,23 @@ public final class BasePermission {
}
public @NonNull PermissionInfo generatePermissionInfo(int adjustedProtectionLevel, int flags) {
final boolean protectionLevelChanged = protectionLevel != adjustedProtectionLevel;
// if we return different protection level, don't use the cached info
if (perm != null && !protectionLevelChanged) {
return PackageParser.generatePermissionInfo(perm, flags);
PermissionInfo permissionInfo;
if (perm != null) {
final boolean protectionLevelChanged = protectionLevel != adjustedProtectionLevel;
permissionInfo = PackageParser.generatePermissionInfo(perm, flags);
if (protectionLevelChanged && permissionInfo == perm.info) {
// if we return different protection level, don't use the cached info
permissionInfo = new PermissionInfo(permissionInfo);
permissionInfo.protectionLevel = adjustedProtectionLevel;
}
return permissionInfo;
}
final PermissionInfo pi = new PermissionInfo();
pi.name = name;
pi.packageName = sourcePackageName;
pi.nonLocalizedLabel = name;
pi.protectionLevel = protectionLevelChanged ? adjustedProtectionLevel : protectionLevel;
return pi;
permissionInfo = new PermissionInfo();
permissionInfo.name = name;
permissionInfo.packageName = sourcePackageName;
permissionInfo.nonLocalizedLabel = name;
permissionInfo.protectionLevel = protectionLevel;
return permissionInfo;
}
public static boolean readLPw(@NonNull Map<String, BasePermission> out,