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

Commit 72125497 authored by Yu-Ting Tseng's avatar Yu-Ting Tseng Committed by Automerger Merge Worker
Browse files

Merge "Fix a bug about AppProfiler / setMemFactorLocked." into udc-dev am:... 

Merge "Fix a bug about AppProfiler / setMemFactorLocked." into udc-dev am: 71aad2a2 am: 9e8a01f4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23393210



Change-Id: I91d539d25bcee99a20a428c4566130b1754af896
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a8a37458 9e8a01f4

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

+8 −8
Original line number Diff line number Diff line
@@ -1202,6 +1202,14 @@ public class AppProfiler { 


        mCachedAppsWatermarkData.updateCachedAppsHighWatermarkIfNecessaryLocked(

                numCached + numEmpty, now);

        boolean allChanged;

        int trackerMemFactor;

        synchronized (mService.mProcessStats.mLock) {

            allChanged = mService.mProcessStats.setMemFactorLocked(memFactor,

                    mService.mAtmInternal == null || !mService.mAtmInternal.isSleeping(),

                    SystemClock.uptimeMillis() /* re-acquire the time within the lock */);

            trackerMemFactor = mService.mProcessStats.getMemFactorLocked();

        }



        if (mService.mConstants.USE_MODERN_TRIM) {

            // Modern trim is not sent based on lowmem state
@@ -1235,14 +1243,6 @@ public class AppProfiler { 


        mLastMemoryLevel = memFactor;

        mLastNumProcesses = mService.mProcessList.getLruSizeLOSP();

        boolean allChanged;

        int trackerMemFactor;

        synchronized (mService.mProcessStats.mLock) {

            allChanged = mService.mProcessStats.setMemFactorLocked(memFactor,

                    mService.mAtmInternal == null || !mService.mAtmInternal.isSleeping(),

                    SystemClock.uptimeMillis() /* re-acquire the time within the lock */);

            trackerMemFactor = mService.mProcessStats.getMemFactorLocked();

        }

        if (memFactor != ADJ_MEM_FACTOR_NORMAL) {

            if (mLowRamStartTime == 0) {

                mLowRamStartTime = now;