Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE Guard against null entries in process list during updateOomAdjLocked am: 84aa5a864f

Browse Source 
am: 36008dd6bd

Change-Id: Ia7e636049d4a3a0490013a54ffb90d7f4f534949
This commit is contained in:
Erik Wolsheimer
2017-02-08 20:01:24 +00:00
committed by android-build-merger
parent d0a937e84b 36008dd6bd
commit 39c36cab3a
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -21035,6 +21035,9 @@ public final class ActivityManagerService extends ActivityManagerNative
int nextEmptyAdj = curEmptyAdj+2;
for (int i=N-1; i>=0; i--) {
ProcessRecord app = mLruProcesses.get(i);
if (app == null) {
continue;
}
if (!app.killedByAm && app.thread != null) {
app.procStateChanged = false;
computeOomAdjLocked(app, ProcessList.UNKNOWN_ADJ, TOP_APP, true, now);
@@ -21210,6 +21213,9 @@ public final class ActivityManagerService extends ActivityManagerNative
int curLevel = ComponentCallbacks2.TRIM_MEMORY_COMPLETE;
for (int i=N-1; i>=0; i--) {
ProcessRecord app = mLruProcesses.get(i);
if (app == null) {
continue;
}
if (allChanged || app.procStateChanged) {
setProcessTrackerStateLocked(app, trackerMemFactor, now);
app.procStateChanged = false;