Merge "Fix isAutoRevokeWhitelisted api to ignore manifest declaration" into rvc-qpr-dev am: 3315572d89 am: 378f8ebf58

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

Change-Id: I8b4343af60af30995f4e4a6957c17e43cb9c0b2c
This commit is contained in:
TreeHugger Robot
2020-08-07 01:36:23 +00:00
committed by Automerger Merge Worker

View File

@@ -25401,18 +25401,7 @@ public class PackageManagerService extends IPackageManager.Stub
int mode = mInjector.getAppOpsManager().checkOpNoThrow(
AppOpsManager.OP_AUTO_REVOKE_PERMISSIONS_IF_UNUSED,
Binder.getCallingUid(), packageName);
if (mode == MODE_ALLOWED) {
return false;
} else if (mode == MODE_IGNORED) {
return true;
} else {
synchronized (mLock) {
boolean manifestWhitelisted =
mPackages.get(packageName).getAutoRevokePermissions()
== ApplicationInfo.AUTO_REVOKE_DISALLOWED;
return manifestWhitelisted;
}
}
return mode == MODE_IGNORED;
}
@Override