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

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

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

Change-Id: I0dd01e822e1ba7cba3c3fe59cefbae2bc40ff3fe
This commit is contained in:
TreeHugger Robot
2020-08-07 01:21:06 +00:00
committed by Automerger Merge Worker
parent c77b4cc610 3315572d89
commit 378f8ebf58
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/pm/PackageManagerService.java
View File

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