From 87fd8bc84b15cde8800eeda95b254227171d87fe Mon Sep 17 00:00:00 2001 From: "Philip P. Moltmann" Date: Thu, 13 Feb 2020 13:16:13 -0800 Subject: [PATCH] Track noted app-ops for appop permissions Test: Built Bug: 10319596 Change-Id: Ia8e3dddbcd4aa28919ede9401bbf3d7d64e2ced5 --- .../core/java/com/android/server/appop/AppOpsService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java index 6911e640a0c73..d73eee63d60df 100644 --- a/services/core/java/com/android/server/appop/AppOpsService.java +++ b/services/core/java/com/android/server/appop/AppOpsService.java @@ -56,6 +56,7 @@ import static android.app.AppOpsManager.resolveFirstUnrestrictedUidState; import static android.content.Intent.ACTION_PACKAGE_REMOVED; import static android.content.Intent.EXTRA_REPLACING; import static android.content.pm.PermissionInfo.PROTECTION_DANGEROUS; +import static android.content.pm.PermissionInfo.PROTECTION_FLAG_APPOP; import static com.android.server.appop.AppOpsService.ModeCallback.ALL_OPS; @@ -3365,7 +3366,8 @@ public class AppOpsService extends IAppOpsService.Stub { return false; } - return permInfo.getProtection() == PROTECTION_DANGEROUS; + return permInfo.getProtection() == PROTECTION_DANGEROUS + || (permInfo.getProtectionFlags() & PROTECTION_FLAG_APPOP) != 0; } private void verifyIncomingUid(int uid) {