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

Commit 29382d29 authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

resolved conflicts for merge of 6abcec1d to master 

Change-Id: I28986f8863298a767a8290b02d5418d4d1d42d17
parents 6cedefa2 6abcec1d

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

+7 −3
Original line number Diff line number Diff line
@@ -17496,6 +17496,10 @@ public final class ActivityManagerService extends ActivityManagerNative 
        mPendingPssProcesses.clear();

        for (int i = mLruProcesses.size() - 1; i >= 0; i--) {

            ProcessRecord app = mLruProcesses.get(i);

            if (app.thread == null

                    || app.curProcState == ActivityManager.PROCESS_STATE_NONEXISTENT) {

                continue;

            }

            if (memLowered || now > (app.lastStateTime+ProcessList.PSS_ALL_INTERVAL)) {

                app.pssProcState = app.setProcState;

                app.nextPssTime = ProcessList.computeNextPssTime(app.curProcState, true,
@@ -17811,8 +17815,8 @@ public final class ActivityManagerService extends ActivityManagerNative 
                }

            }

        }

        if (app.setProcState < 0 || ProcessList.procStatesDifferForMem(app.curProcState,

                app.setProcState)) {

        if (app.setProcState == ActivityManager.PROCESS_STATE_NONEXISTENT

                || ProcessList.procStatesDifferForMem(app.curProcState, app.setProcState)) {

            if (false && mTestPssMode && app.setProcState >= 0 && app.lastStateTime <= (now-200)) {

                // Experimental code to more aggressively collect pss while

                // running test...  the problem is that this tends to collect

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

+5 −4
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.am;



import static android.app.ActivityManager.PROCESS_STATE_NONEXISTENT;

import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM;

import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME;
@@ -89,10 +90,10 @@ final class ProcessRecord { 
    int curSchedGroup;          // Currently desired scheduling class

    int setSchedGroup;          // Last set to background scheduling class

    int trimMemoryLevel;        // Last selected memory trimming level

    int curProcState = -1;      // Currently computed process state: ActivityManager.PROCESS_STATE_*

    int repProcState = -1;      // Last reported process state

    int setProcState = -1;      // Last set process state in process tracker

    int pssProcState = -1;      // The proc state we are currently requesting pss for

    int curProcState = PROCESS_STATE_NONEXISTENT; // Currently computed process state

    int repProcState = PROCESS_STATE_NONEXISTENT; // Last reported process state

    int setProcState = PROCESS_STATE_NONEXISTENT; // Last set process state in process tracker

    int pssProcState = PROCESS_STATE_NONEXISTENT; // Currently requesting pss for

    boolean serviceb;           // Process currently is on the service B list

    boolean serviceHighRam;     // We are forcing to service B list due to its RAM use

    boolean setIsForeground;    // Running foreground UI when last set?