From 9b1ead5c293fc10ae1d7057b96d77972fa724817 Mon Sep 17 00:00:00 2001 From: Eugene Susla Date: Tue, 28 Jul 2020 15:16:03 -0700 Subject: [PATCH] Fix isAutoRevokeWhitelisted api to ignore manifest declaration This behavior is a leftover from it was expected we'll have a manifest-based whitelist Test: use the app to ensure manifest declaration no longer changes API result Fixes: 162077344 Change-Id: If613d02c74459d61d9dd7db05ad5c60a129f16e3 --- .../android/server/pm/PackageManagerService.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 63c721a5da7b3..eefad1c8eed29 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -25289,18 +25289,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