PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'd9c029f8372057d14d52fee5e6e842926b8c3b6f':
  Fix issue #7050530: NPE in Settings : settings.applications.RunningServiceDetails...
This commit is contained in:
Dianne Hackborn
2012-09-18 14:54:11 -07:00
committed by Android Git Automerger
parent 1fe9f6b19f d9c029f837
commit 9706ccab84
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/com/android/settings/applications/RunningServiceDetails.java
View File

@@ -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);
}
}