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

Commit 799b1af8 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by android-build-merger
Browse files

Merge "Work on issue #38242094: Activity manager oom adj computation seems broken" into oc-dev 

am: e2f908b6

Change-Id: I07dc985a1489005e45cd08960d997c23a75b8ccc
parents b558f004 e2f908b6

services/core/java/com/android/server/am/ActivityManagerDebugConfig.java

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ class ActivityManagerDebugConfig { 
    static final boolean DEBUG_MU = DEBUG_ALL || false;

    static final boolean DEBUG_NETWORK = DEBUG_ALL || false;

    static final boolean DEBUG_OOM_ADJ = DEBUG_ALL || false;

    static final boolean DEBUG_OOM_ADJ_REASON = DEBUG_ALL || false;

    static final boolean DEBUG_PAUSE = DEBUG_ALL || false;

    static final boolean DEBUG_POWER = DEBUG_ALL || false;

    static final boolean DEBUG_POWER_QUICK = DEBUG_POWER || false;

services/core/java/com/android/server/am/ActivityManagerService.java

+107 −18

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/am/ProcessList.java

+1 −1

File changed.

Contains only whitespace changes.