commit f7307555409fce92a11de360f586ff4d76449eed
author Hai Zhang <zhanghai@google.com> Tue Feb 04 17:40:07 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 04 17:40:07 2020 +0000
tree 4d2e906c77fba9201de932bdfdd340dc820aaae1
parent f27a9578e584b71e109f7d9fca730a5163aa43ae
parent 8642553a381b23a09e12be84034d44f32b802178

Merge "Don't try to set REVOKED_COMPAT when permission isn't granted."

services/core/java/com/android/server/appop/AppOpsService.java

diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java
index 72dd6cf..83f46f4 100644
--- a/services/core/java/com/android/server/appop/AppOpsService.java
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
@@ -2087,6 +2087,11 @@
                 continue;
             }
 
+            if (packageManager.checkPermission(permissionName, packageName)
+                    != PackageManager.PERMISSION_GRANTED) {
+                continue;
+            }
+
             PermissionInfo permissionInfo;
             try {
                 permissionInfo = packageManager.getPermissionInfo(permissionName, 0);