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

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

Merge "Further tweak to issue #issue #25371736: Don't include z-ram... 

Merge "Further tweak to issue #issue #25371736: Don't include z-ram allocations in Android OS" into mnc-dr-dev
parents 508559d0 b6c7b050

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

+9 −5
Original line number Diff line number Diff line
@@ -201,17 +201,21 @@ public class ProcStatsData { 
        for (int i = pkgEntries.size() - 1; i >= 0 && totalTime > 0; i--) {

            ProcStatsPackageEntry entry = pkgEntries.get(i);

            long pkgRunTime = 0;

            long maxRunTime = 0;

            for (int j = entry.mEntries.size() - 1; j >= 0; j--) {

                ProcStatsEntry proc = entry.mEntries.get(j);

                pkgRunTime += proc.mRunDuration;

                if (proc.mRunDuration > maxRunTime) {

                    maxRunTime = proc.mRunDuration;

                }

            }

            long pkgZRam = (zramMem*pkgRunTime)/totalTime;

            if (pkgZRam > 0) {

                zramMem -= pkgZRam;

                totalTime -= pkgRunTime;

                ProcStatsEntry procEntry = new ProcStatsEntry(entry.mPackage, 0,

                        mContext.getString(R.string.process_stats_os_zram), memTotalTime,

                        pkgZRam);

                        mContext.getString(R.string.process_stats_os_zram), maxRunTime,

                        pkgZRam, memTotalTime);

                procEntry.evaluateTargetPackage(mPm, mStats, null, null, sEntryCompare, mUseUss);

                entry.addEntry(procEntry);

            }
@@ -226,14 +230,14 @@ public class ProcStatsData { 
        if (totalMem.sysMemNativeWeight > 0) {

            osEntry = new ProcStatsEntry(Utils.OS_PKG, 0,

                    mContext.getString(R.string.process_stats_os_native), memTotalTime,

                    (long) (totalMem.sysMemNativeWeight / memTotalTime));

                    (long) (totalMem.sysMemNativeWeight / memTotalTime), memTotalTime);

            osEntry.evaluateTargetPackage(mPm, mStats, bgTotals, runTotals, sEntryCompare, mUseUss);

            osPkg.addEntry(osEntry);

        }

        if (totalMem.sysMemKernelWeight > 0) {

            osEntry = new ProcStatsEntry(Utils.OS_PKG, 0,

                    mContext.getString(R.string.process_stats_os_kernel), memTotalTime,

                    (long) (totalMem.sysMemKernelWeight / memTotalTime));

                    (long) (totalMem.sysMemKernelWeight / memTotalTime), memTotalTime);

            osEntry.evaluateTargetPackage(mPm, mStats, bgTotals, runTotals, sEntryCompare, mUseUss);

            osPkg.addEntry(osEntry);

        }
@@ -249,7 +253,7 @@ public class ProcStatsData { 
        if (baseCacheRam > 0) {

            osEntry = new ProcStatsEntry(Utils.OS_PKG, 0,

                    mContext.getString(R.string.process_stats_os_cache), memTotalTime,

                    baseCacheRam / 1024);

                    baseCacheRam / 1024, memTotalTime);

            osEntry.evaluateTargetPackage(mPm, mStats, bgTotals, runTotals, sEntryCompare, mUseUss);

            osPkg.addEntry(osEntry);

        }

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

+3 −2
Original line number Diff line number Diff line
@@ -72,13 +72,14 @@ public final class ProcStatsEntry implements Parcelable { 
                + " avgpss=" + mAvgBgMem + " weight=" + mBgWeight);

    }



    public ProcStatsEntry(String pkgName, int uid, String procName, long duration, long mem) {

    public ProcStatsEntry(String pkgName, int uid, String procName, long duration, long mem,

            long memDuration) {

        mPackage = pkgName;

        mUid = uid;

        mName = procName;

        mBgDuration = mRunDuration = duration;

        mAvgBgMem = mMaxBgMem = mAvgRunMem = mMaxRunMem = mem;

        mBgWeight = mRunWeight = ((double)duration) * mem;

        mBgWeight = mRunWeight = ((double)memDuration) * mem;

        if (DEBUG) Log.d(TAG, "New proc entry " + procName + ": dur=" + mBgDuration

                + " avgpss=" + mAvgBgMem + " weight=" + mBgWeight);

    }