Merge "Fix NullPointerException at RunningState"

2013-04-16 13:16:17 +00:00
parent 91b5fab9b0 910b2116b0
commit c1e3983b31
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,