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

Commit 04cca35b authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

resolved conflicts for merge of cc585f86 to master 

Change-Id: I72aa7707edeb48f63fbe5348915a31650bdfd8f5
parents 05a34139 cc585f86

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

+1 −2
Original line number Diff line number Diff line
@@ -15064,8 +15064,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
        }

        mLastMemoryLevel = memFactor;

        mLastNumProcesses = mLruProcesses.size();

        boolean allChanged = mProcessStats.setMemFactorLocked(

                ProcessStats.ADJ_MEM_FACTOR_NORMAL, !mSleeping, now);

        boolean allChanged = mProcessStats.setMemFactorLocked(memFactor, !mSleeping, now);

        final int trackerMemFactor = mProcessStats.getMemFactorLocked();

        if (memFactor != ProcessStats.ADJ_MEM_FACTOR_NORMAL) {

            if (mLowRamStartTime == 0) {

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

+1 −9
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ final class ProcessList { 


    // The number of cached at which we don't consider it necessary to do

    // memory trimming.

    static final int TRIM_CACHED_APPS = (MAX_CACHED_APPS-MAX_EMPTY_APPS)/2;

    static final int TRIM_CACHED_APPS = ((MAX_CACHED_APPS-MAX_EMPTY_APPS)*2)/3;



    // Threshold of number of cached+empty where we consider memory critical.

    static final int TRIM_CRITICAL_THRESHOLD = 3;
@@ -145,14 +145,6 @@ final class ProcessList { 
    // Threshold of number of cached+empty where we consider memory critical.

    static final int TRIM_LOW_THRESHOLD = 5;



    // We put empty content processes after any cached processes that have

    // been idle for less than 15 seconds.

    static final long CONTENT_APP_IDLE_OFFSET = 15*1000;



    // We put empty content processes after any cached processes that have

    // been idle for less than 120 seconds.

    static final long EMPTY_APP_IDLE_OFFSET = 120*1000;



    // Low Memory Killer Daemon command codes.

    // These must be kept in sync with the definitions in lmkd.c

    //