From 50f0514e6957b38d98a6c95d871fd9993e6cd191 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Fri, 30 Oct 2015 17:03:59 -0400 Subject: [PATCH] PackageManager can return null. Change-Id: Ie1fb3d5276c0b176a09e5510f26624e8087c90d4 --- .../server/notification/ManagedServices.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/services/core/java/com/android/server/notification/ManagedServices.java b/services/core/java/com/android/server/notification/ManagedServices.java index d2a264d775bff..c7551c50e9f06 100644 --- a/services/core/java/com/android/server/notification/ManagedServices.java +++ b/services/core/java/com/android/server/notification/ManagedServices.java @@ -345,20 +345,21 @@ abstract public class ManagedServices { userId); if (DEBUG) Slog.v(TAG, mConfig.serviceInterface + " services: " + installedServices); + if (installedServices != null) { + for (int i = 0, count = installedServices.size(); i < count; i++) { + ResolveInfo resolveInfo = installedServices.get(i); + ServiceInfo info = resolveInfo.serviceInfo; - for (int i = 0, count = installedServices.size(); i < count; i++) { - ResolveInfo resolveInfo = installedServices.get(i); - ServiceInfo info = resolveInfo.serviceInfo; - - ComponentName component = new ComponentName(info.packageName, info.name); - if (!mConfig.bindPermission.equals(info.permission)) { - Slog.w(TAG, "Skipping " + getCaption() + " service " - + info.packageName + "/" + info.name - + ": it does not require the permission " - + mConfig.bindPermission); - continue; + ComponentName component = new ComponentName(info.packageName, info.name); + if (!mConfig.bindPermission.equals(info.permission)) { + Slog.w(TAG, "Skipping " + getCaption() + " service " + + info.packageName + "/" + info.name + + ": it does not require the permission " + + mConfig.bindPermission); + continue; + } + installed.add(component); } - installed.add(component); } return installed; }