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

Commit 4b9be76b authored by Alexandra Gherghina's avatar Alexandra Gherghina Committed by android-build-merger
Browse files

am 0d04d8cb: am 32ca6f1f: Merge "Fix NPE in Running Processes view in Apps... 

am 0d04d8cb: am 32ca6f1f: Merge "Fix NPE in Running Processes view in Apps Settings" into lmp-mr1-dev
automerge: a8f70740

* commit 'a8f70740':
  Fix NPE in Running Processes view in Apps Settings
parents ff7c75cd a8f70740

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

+7 −2
Original line number Diff line number Diff line
@@ -756,6 +756,8 @@ public class RunningState { 
        synchronized (mLock) {

            mResumed = true;

            mRefreshUiListener = listener;

            // TODO: The set of users may have changed too, so we should probably recompute it

            // each time, but that might be costly. See http://b/18696308

            if (mInterestingConfigChanges.applyNewConfig(mApplicationContext.getResources())) {

                mHaveData = false;

                mBackgroundHandler.removeMessages(MSG_RESET_CONTENTS);
@@ -833,6 +835,10 @@ public class RunningState { 
            UserState userState = mUsers.get(newItem.mUserId);

            UserInfo info = userState != null

                    ? userState.mInfo : mUm.getUserInfo(newItem.mUserId);

            if (info == null) {

                // The user no longer exists, skip

                return;

            }

            if (mHideManagedProfiles && info.isManagedProfile()) {

                return;

            }
@@ -1146,7 +1152,6 @@ public class RunningState { 
            

            ArrayList<BaseItem> newItems = new ArrayList<BaseItem>();

            ArrayList<MergedItem> newMergedItems = new ArrayList<MergedItem>();

            SparseArray<MergedItem> otherUsers = null;

            mProcessItems.clear();

            for (int i=0; i<sortedProcesses.size(); i++) {

                ProcessItem pi = sortedProcesses.get(i);