commit 3c9543e29c637191859fb239960ef4930a128621
author Svet Ganov <svetoslavganov@google.com> Tue Mar 30 23:09:15 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Apr 01 00:10:01 2021 +0000
tree 9f6c537769c4fd33b16f6227819366fa62c466d1
parent 5a5b70b3a8224e882347c56198b21fc1f1a08a32

Fix NPE in PermsissionChecker

Also added some logging for runtime permissions with no app op

bug: 184093962

Test: Setting up device with work account

Change-Id: I85787367b11d57ed1240fcf484ad7d2efa13d406
(cherry picked from commit 623ff43bdade381e918fceb6bad69681b89308b6)

core/java/android/content/PermissionChecker.java

diff --git a/core/java/android/content/PermissionChecker.java b/core/java/android/content/PermissionChecker.java
index 6a254bd0..fc963fe 100644
--- a/core/java/android/content/PermissionChecker.java
+++ b/core/java/android/content/PermissionChecker.java
@@ -16,6 +16,7 @@
 
 package android.content;
 
+import android.Manifest;
 import android.annotation.IntDef;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
@@ -845,7 +846,7 @@
             boolean forDataDelivery, boolean fromDatasource) {
         final int op = AppOpsManager.permissionToOpCode(permission);
         if (op < 0) {
-            Slog.wtf(LOG_TAG, "Appop permission " + permission + "with no app op defined:!");
+            Slog.wtf(LOG_TAG, "Appop permission " + permission + " with no app op defined!");
             return PERMISSION_HARD_DENIED;
         }
 
@@ -933,7 +934,15 @@
             }
 
             if (op < 0) {
-                Slog.wtf(LOG_TAG, "Runtime permission " + permission + "with no app op defined:!");
+                // Bg location is one-off runtime modifier permission and has no app op
+                if (sPlatformPermissions.contains(permission)
+                        && !Manifest.permission.ACCESS_BACKGROUND_LOCATION.equals(permission)) {
+                    Slog.wtf(LOG_TAG, "Platform runtime permission " + permission
+                            + " with no app op defined!");
+                }
+                if (next == null) {
+                    return PERMISSION_GRANTED;
+                }
                 current = next;
                 continue;
             }