From c7d862cf1164ae9c7b48c4146faa59b53868aaa3 Mon Sep 17 00:00:00 2001
From: Hai Zhang <zhanghai@google.com>
Date: Thu, 1 Oct 2020 12:25:29 -0700
Subject: [PATCH] Fix NPE in isPermissionReviewRequired().

We need to check if mPermissions is null.

Fixes: 169848819
Bug: 158736025
Test: presubmit
Change-Id: I3641cda64a3efdb25f2e45425edd993d1702bcf6
---
 .../com/android/server/pm/permission/UidPermissionState.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/pm/permission/UidPermissionState.java b/services/core/java/com/android/server/pm/permission/UidPermissionState.java
index c73e2f3e153b7..82ab95464a281 100644
--- a/services/core/java/com/android/server/pm/permission/UidPermissionState.java
+++ b/services/core/java/com/android/server/pm/permission/UidPermissionState.java
@@ -338,6 +338,9 @@ public final class UidPermissionState {
 
     public boolean isPermissionReviewRequired() {
         synchronized (mLock) {
+            if (mPermissions == null) {
+                return false;
+            }
             final int permissionsSize = mPermissions.size();
             for (int i = 0; i < permissionsSize; i++) {
                 final PermissionState permission = mPermissions.valueAt(i);