From 9fae74f6c37b60d10a2bddb214c28e7f9f7484f3 Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Tue, 18 Sep 2012 14:17:36 -0700
Subject: [PATCH] Fix issue #7050530: NPE in Settings :
 settings.applications.RunningServiceDetails...

...addDetailViews(RunningServiceDetails.java:439)

Change-Id: Id4a110bacf4da1bec07272b3b75e8bf0986cab92
---
 .../applications/RunningServiceDetails.java   | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/com/android/settings/applications/RunningServiceDetails.java b/src/com/android/settings/applications/RunningServiceDetails.java
index 52ed4586134..555f192554b 100644
--- a/src/com/android/settings/applications/RunningServiceDetails.java
+++ b/src/com/android/settings/applications/RunningServiceDetails.java
@@ -436,22 +436,24 @@ public class RunningServiceDetails extends Fragment
 
         mNumServices = mNumProcesses = 0;
 
-        if (mMergedItem.mUser != null) {
-            ArrayList<RunningState.MergedItem> items;
-            if (mShowBackground) {
-                items = new ArrayList<RunningState.MergedItem>(mMergedItem.mChildren);
-                Collections.sort(items, mState.mBackgroundComparator);
+        if (mMergedItem != null) {
+            if (mMergedItem.mUser != null) {
+                ArrayList<RunningState.MergedItem> items;
+                if (mShowBackground) {
+                    items = new ArrayList<RunningState.MergedItem>(mMergedItem.mChildren);
+                    Collections.sort(items, mState.mBackgroundComparator);
+                } else {
+                    items = mMergedItem.mChildren;
+                }
+                for (int i=0; i<items.size(); i++) {
+                    addDetailsViews(items.get(i), true, false);
+                }
+                for (int i=0; i<items.size(); i++) {
+                    addDetailsViews(items.get(i), false, true);
+                }
             } else {
-                items = mMergedItem.mChildren;
+                addDetailsViews(mMergedItem, true, true);
             }
-            for (int i=0; i<items.size(); i++) {
-                addDetailsViews(items.get(i), true, false);
-            }
-            for (int i=0; i<items.size(); i++) {
-                addDetailsViews(items.get(i), false, true);
-            }
-        } else {
-            addDetailsViews(mMergedItem, true, true);
         }
     }