Merge "Fix issue #7050530: NPE in Settings : settings.applications.RunningServiceDetails..." into jb-mr1-dev

2012-09-18 14:19:27 -07:00
parent 221e4356e1 9fae74f6c3
commit 9ba3d227e3
1 changed files with 16 additions and 14 deletions
--- a/src/com/android/settings/applications/RunningServiceDetails.java
+++ b/src/com/android/settings/applications/RunningServiceDetails.java
@@ -436,6 +436,7 @@ public class RunningServiceDetails extends Fragment

        mNumServices = mNumProcesses = 0;

+        if (mMergedItem != null) {
            if (mMergedItem.mUser != null) {
                ArrayList<RunningState.MergedItem> items;
                if (mShowBackground) {
@@ -454,6 +455,7 @@ public class RunningServiceDetails extends Fragment
                addDetailsViews(mMergedItem, true, true);
            }
        }
+    }
    
    void refreshUi(boolean dataChanged) {
        if (findMergedItem()) {