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

Merge "Relax restrictions on appop protection level" into sc-dev

Browse Source
This commit is contained in:
Suprabh Shukla
2021-02-06 00:56:29 +00:00
committed by Android (Google) Code Review
parent d43d8655c6 f7e44ca988
commit e5cb2b87a4
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/android/content/pm/parsing/component/ParsedPermissionUtils.java
View File

@@ -108,17 +108,14 @@ public class ParsedPermissionUtils {
permission.protectionLevel = PermissionInfo.fixProtectionLevel(permission.protectionLevel); permission.protectionLevel = PermissionInfo.fixProtectionLevel(permission.protectionLevel);
if (permission.getProtectionFlags() != 0) { final int otherProtectionFlags = permission.getProtectionFlags()
if ((permission.protectionLevel & PermissionInfo.PROTECTION_FLAG_INSTANT) == 0 & ~(PermissionInfo.PROTECTION_FLAG_APPOP | PermissionInfo.PROTECTION_FLAG_INSTANT
&& (permission.protectionLevel & PermissionInfo.PROTECTION_FLAG_RUNTIME_ONLY) | PermissionInfo.PROTECTION_FLAG_RUNTIME_ONLY);
== 0 if (otherProtectionFlags != 0
&& (permission.protectionLevel & PermissionInfo.PROTECTION_MASK_BASE) && permission.getProtection() != PermissionInfo.PROTECTION_SIGNATURE
!= PermissionInfo.PROTECTION_SIGNATURE && permission.getProtection() != PermissionInfo.PROTECTION_INTERNAL) {
&& (permission.protectionLevel & PermissionInfo.PROTECTION_MASK_BASE) return input.error("<permission> protectionLevel specifies a non-instant, non-appop,"
!= PermissionInfo.PROTECTION_INTERNAL) { + " non-runtimeOnly flag but is not based on signature or internal type");
return input.error("<permission> protectionLevel specifies a non-instant flag "
+ "but is not based on signature or internal type");
}
} }
return ComponentParseUtils.parseAllMetaData(pkg, res, parser, tag, permission, input); return ComponentParseUtils.parseAllMetaData(pkg, res, parser, tag, permission, input);