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

Merge "fix typos"

Browse Source
This commit is contained in:
Manjeet Rulhania
2022-12-20 06:46:28 +00:00
committed by Android (Google) Code Review
parent 1aa46c2832 2ccb527852
commit aa5b848680
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
View File

@@ -683,7 +683,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
if (bp == null) {
return;
}
if (bp.isDynamic()) {
if (!bp.isDynamic()) {
// TODO: switch this back to SecurityException
Slog.wtf(TAG, "Not allowed to modify non-dynamic permission "
+ permName);
@@ -1299,13 +1299,13 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
}
}
}
}
if ((flags & PackageManager.FLAG_PERMISSION_WHITELIST_INSTALLER) != 0) {
if (!isCallerPrivileged && !isCallerInstallerOnRecord) {
throw new SecurityException("Modifying installer allowlist requires"
+ " being installer on record or "
+ Manifest.permission.WHITELIST_RESTRICTED_PERMISSIONS);
}
if ((flags & PackageManager.FLAG_PERMISSION_WHITELIST_INSTALLER) != 0) {
if (!isCallerPrivileged && !isCallerInstallerOnRecord) {
throw new SecurityException("Modifying installer allowlist requires"
+ " being installer on record or "
+ Manifest.permission.WHITELIST_RESTRICTED_PERMISSIONS);
}
}