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

Commit 2dec0c78 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev

parents 938501cf a24b836e

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

+5 −3
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ public class ProcStatsData { 
                ProcessStats.ALL_SCREEN_ADJ, mMemStates, ProcessStats.NON_CACHED_PROC_STATES);



        createPkgMap(getProcs(bgTotals, runTotals), bgTotals, runTotals);

        if (totalMem.sysMemZRamWeight > 0) {

        if (totalMem.sysMemZRamWeight > 0 && !totalMem.hasSwappedOutPss) {

            distributeZRam(totalMem.sysMemZRamWeight);

        }
@@ -418,8 +418,10 @@ public class ProcStatsData { 
            memReader.readMemInfo();

            realTotalRam = memReader.getTotalSize();

            freeWeight = totalMem.sysMemFreeWeight + totalMem.sysMemCachedWeight;

            usedWeight = totalMem.sysMemKernelWeight + totalMem.sysMemNativeWeight

                    + totalMem.sysMemZRamWeight;

            usedWeight = totalMem.sysMemKernelWeight + totalMem.sysMemNativeWeight;

            if (!totalMem.hasSwappedOutPss) {

                usedWeight += totalMem.sysMemZRamWeight;

            }

            for (int i = 0; i < ProcessStats.STATE_COUNT; i++) {

                if (i == ProcessStats.STATE_SERVICE_RESTARTING) {

                    // These don't really run.