commit 7141a092635f7342873241b2c2a6b5241a9dd5ba
author Julia Reynolds <juliacr@google.com> Thu Mar 23 14:09:06 2017 -0400
committer gitbuildkicker <android-build@google.com> Thu Mar 23 16:36:44 2017 -0700
tree 34aa85f26851505b165546cb2c0b3806de00780d
parent 719e42bfaf4eb40da3f9df8bbbb149f4644f84df

Add null check on serviceinfo

Fixes: 36542315
Test: adb shell settings put secure enabled_notification_listeners
"com.android.systemui/.BogusComponent"
doesn't cause restart
Change-Id: I9ec12970a32f4909df0676b287c4cd45076968cf

(cherry picked from commit 8bb5c93feefadc59113b1c4f040e11a6a05feef5)

services/core/java/com/android/server/notification/ManagedServices.java

diff --git a/services/core/java/com/android/server/notification/ManagedServices.java b/services/core/java/com/android/server/notification/ManagedServices.java
index 11cc52d..0774779 100644
--- a/services/core/java/com/android/server/notification/ManagedServices.java
+++ b/services/core/java/com/android/server/notification/ManagedServices.java
@@ -583,7 +583,7 @@
                     ServiceInfo info = mPm.getServiceInfo(component,
                             PackageManager.MATCH_DIRECT_BOOT_AWARE
                                     | PackageManager.MATCH_DIRECT_BOOT_UNAWARE, userIds[i]);
-                    if (!mConfig.bindPermission.equals(info.permission)) {
+                    if (info == null || !mConfig.bindPermission.equals(info.permission)) {
                         Slog.w(TAG, "Skipping " + getCaption() + " service " + component
                                 + ": it does not require the permission " + mConfig.bindPermission);
                         continue;