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

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

Browse Source 
automerge: a8f7074

* commit 'a8f70740c495f7d3f47db65bb08ccdb58c52b178':
  Fix NPE in Running Processes view in Apps Settings
This commit is contained in:
Alexandra Gherghina
2014-12-10 22:28:34 +00:00
committed by android-build-merger
parent ff7c75cd17 a8f70740c4
commit 4b9be76b1d
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/applications/RunningState.java
View File

@@ -756,6 +756,8 @@ public class RunningState {
synchronized (mLock) { synchronized (mLock) {
mResumed = true; mResumed = true;
mRefreshUiListener = listener; 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())) { if (mInterestingConfigChanges.applyNewConfig(mApplicationContext.getResources())) {
mHaveData = false; mHaveData = false;
mBackgroundHandler.removeMessages(MSG_RESET_CONTENTS); mBackgroundHandler.removeMessages(MSG_RESET_CONTENTS);
@@ -833,6 +835,10 @@ public class RunningState {
UserState userState = mUsers.get(newItem.mUserId); UserState userState = mUsers.get(newItem.mUserId);
UserInfo info = userState != null UserInfo info = userState != null
? userState.mInfo : mUm.getUserInfo(newItem.mUserId); ? userState.mInfo : mUm.getUserInfo(newItem.mUserId);
if (info == null) {
// The user no longer exists, skip
return;
}
if (mHideManagedProfiles && info.isManagedProfile()) { if (mHideManagedProfiles && info.isManagedProfile()) {
return; return;
} }
@@ -856,7 +862,7 @@ public class RunningState {
private boolean update(Context context, ActivityManager am) { private boolean update(Context context, ActivityManager am) {
final PackageManager pm = context.getPackageManager(); final PackageManager pm = context.getPackageManager();
mSequence++; mSequence++;
boolean changed = false; boolean changed = false;
@@ -1146,7 +1152,6 @@ public class RunningState {
ArrayList<BaseItem> newItems = new ArrayList<BaseItem>(); ArrayList<BaseItem> newItems = new ArrayList<BaseItem>();
ArrayList<MergedItem> newMergedItems = new ArrayList<MergedItem>(); ArrayList<MergedItem> newMergedItems = new ArrayList<MergedItem>();
SparseArray<MergedItem> otherUsers = null;
mProcessItems.clear(); mProcessItems.clear();
for (int i=0; i<sortedProcesses.size(); i++) { for (int i=0; i<sortedProcesses.size(); i++) {
ProcessItem pi = sortedProcesses.get(i); ProcessItem pi = sortedProcesses.get(i);