commit d63bd61ee862db18677276b1a18b2d7938a5e193
author Amith Yamasani <yamasani@google.com> Thu Jun 06 18:16:31 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 06 18:16:31 2013 +0000
tree 8abd882be94551b9e1b408398ca4be17423010ca
parent 804b8b60e7784ebbf660cf4348de24c1b2ae7146
parent 6fd58003860c2fe6f9e4965fd06d7063c5c14566

Merge "Fix NullPointerException at RunningState" into jb-mr2-dev

src/com/android/settings/applications/RunningState.java

diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java
index 5797dfa..d373fdd 100644
--- a/src/com/android/settings/applications/RunningState.java
+++ b/src/com/android/settings/applications/RunningState.java
@@ -462,6 +462,12 @@
                     si.mServiceInfo = ActivityThread.getPackageManager().getServiceInfo(
                             service.service, PackageManager.GET_UNINSTALLED_PACKAGES,
                             UserHandle.getUserId(service.uid));
+
+                    if (si.mServiceInfo == null) {
+                        Log.d("RunningService", "getServiceInfo returned null for: "
+                                + service.service);
+                        return false;
+                    }
                 } catch (RemoteException e) {
                 }
                 si.mDisplayLabel = makeLabel(pm,