diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-09-18 14:19:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-18 14:19:28 -0700 |
| commit | 9ba3d227e37b49412fe146b43f15aabb1da0d008 (patch) | |
| tree | 6f96d99967f6f53b87ba4c921d18a31003bd07b1 /src/com/android/settings/applications | |
| parent | 221e4356e1cbf24dd32037800601df91c3b85c6d (diff) | |
| parent | 9fae74f6c37b60d10a2bddb214c28e7f9f7484f3 (diff) | |
| download | packages_apps_settings-9ba3d227e37b49412fe146b43f15aabb1da0d008.zip packages_apps_settings-9ba3d227e37b49412fe146b43f15aabb1da0d008.tar.gz packages_apps_settings-9ba3d227e37b49412fe146b43f15aabb1da0d008.tar.bz2 | |
Merge "Fix issue #7050530: NPE in Settings : settings.applications.RunningServiceDetails..." into jb-mr1-dev
Diffstat (limited to 'src/com/android/settings/applications')
| -rw-r--r-- | src/com/android/settings/applications/RunningServiceDetails.java | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/src/com/android/settings/applications/RunningServiceDetails.java b/src/com/android/settings/applications/RunningServiceDetails.java index 52ed458..555f192 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); } } |