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

Commit 0493a6bc authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Merge "Fix meminfo accounting for visible apps" into nyc-dev am: 505a8d9d 

am: 14bab2f4

* commit '14bab2f4':
  Fix meminfo accounting for visible apps

Change-Id: Ifef708767c317e4dc66db70b8c7cde013dc6a99f
parents 641caccd 14bab2f4

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

+3 −2
Original line number Diff line number Diff line
@@ -15456,8 +15456,9 @@ public final class ActivityManagerService extends ActivityManagerNative 
                    }















                    for (int oomIndex=0; oomIndex<oomPss.length; oomIndex++) {













                        if (oomAdj <= DUMP_MEM_OOM_ADJ[oomIndex]













                                || oomIndex == (oomPss.length-1)) {













                        if (oomIndex == (oomPss.length - 1)













                                || (oomAdj >= DUMP_MEM_OOM_ADJ[oomIndex]













                                        && oomAdj < DUMP_MEM_OOM_ADJ[oomIndex + 1])) {















                            oomPss[oomIndex] += myTotalPss;















                            oomSwapPss[oomIndex] += myTotalSwapPss;















                            if (oomProcs[oomIndex] == null) {