From 42f0b444c893223b9d901c388447e42d67db397e Mon Sep 17 00:00:00 2001
From: "Philip P. Moltmann" <moltmann@google.com>
Date: Tue, 11 Dec 2018 07:28:28 -0800
Subject: [PATCH] Check for perm being null in base permission

Test: Booted
Change-Id: I1c6256faab366b6d3b97a2da8958d1feeedf80cf
Fixes: 120833531
---
 .../java/com/android/server/pm/permission/BasePermission.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/permission/BasePermission.java b/services/core/java/com/android/server/pm/permission/BasePermission.java
index 996f42b646644..59f67fff22fc4 100644
--- a/services/core/java/com/android/server/pm/permission/BasePermission.java
+++ b/services/core/java/com/android/server/pm/permission/BasePermission.java
@@ -191,7 +191,8 @@ public final class BasePermission {
     }
 
     public boolean isRemoved() {
-        return perm.info != null && (perm.info.flags & PermissionInfo.FLAG_REMOVED) != 0;
+        return perm != null && perm.info != null
+                && (perm.info.flags & PermissionInfo.FLAG_REMOVED) != 0;
     }
 
     public boolean isSignature() {