am b7e49231: am c1e3983b: Merge "Fix NullPointerException at RunningState"

* commit 'b7e49231ff8c03120c80a28edc43eca83266497b': Fix NullPointerException at RunningState
2013-04-16 06:45:58 -07:00
parent cfb26bbb5b b7e49231ff
commit f4bfad995d
1 changed files with 6 additions and 0 deletions
--- a/src/com/android/settings/applications/RunningState.java
+++ b/src/com/android/settings/applications/RunningState.java
@@ -462,6 +462,12 @@ public class RunningState {
                    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,