| commit | 1edf4f64e749ab2608c611e97cf0cd40f7597577 | [log] [tgz] |
|---|---|---|
| author | Philip P. Moltmann <moltmann@google.com> | Tue Dec 11 07:28:28 2018 -0800 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Tue Dec 11 17:28:12 2018 +0000 |
| tree | 682f047d0aaa18ba11044973d06594e63c295f4b | |
| parent | 4f0fe261d013d1687585df27e3220810b1e0cc44 [diff] |
Check for perm being null in base permission Test: Booted Change-Id: I1c6256faab366b6d3b97a2da8958d1feeedf80cf Fixes: 120833531 (cherry picked from commit 42f0b444c893223b9d901c388447e42d67db397e)
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 996f42b..59f67ff 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 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() {