Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ba3d227 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #7050530: NPE in Settings :... 

Merge "Fix issue #7050530: NPE in Settings : settings.applications.RunningServiceDetails..." into jb-mr1-dev
parents 221e4356 9fae74f6

src/com/android/settings/applications/RunningServiceDetails.java

+16 −14
Original line number Diff line number Diff line
@@ -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()) {