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

Commit b6c9326a authored by David Stevens's avatar David Stevens Committed by Android (Google) Code Review
Browse files

Merge "Clean up dead code from activity manager" into main

parents 9f9fb51b bfb86ae9

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

+0 −6
Original line number Diff line number Diff line
@@ -301,12 +301,6 @@ public class AppProfiler { 
    @GuardedBy("mProfilerLock")

    private boolean mMemWatchIsUserInitiated;



    @GuardedBy("mService")

    boolean mHasHomeProcess;



    @GuardedBy("mService")

    boolean mHasPreviousProcess;



    /**

     * Used to collect per-process CPU use for ANRs, battery stats, etc.

     * Must acquire this object's lock when accessing it.

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

+0 −1
Original line number Diff line number Diff line
@@ -896,7 +896,6 @@ public class OomAdjusterImpl extends OomAdjuster { 
        mProcessStateCurTop = mService.mAtmInternal.getTopProcessState();

        // Clear any pending ones because we are doing a full update now.

        mPendingProcessSet.clear();

        mService.mAppProfiler.mHasPreviousProcess = mService.mAppProfiler.mHasHomeProcess = false;



        mLastReason = oomAdjReason;

        Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, oomAdjReasonToString(oomAdjReason));

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

+0 −2
Original line number Diff line number Diff line
@@ -1046,7 +1046,6 @@ final class ProcessStateRecord { 
        if (mCachedIsHomeProcess == VALUE_INVALID) {

            if (mApp.getWindowProcessController().isHomeProcess()) {

                mCachedIsHomeProcess = VALUE_TRUE;

                mService.mAppProfiler.mHasHomeProcess = true;

            } else {

                mCachedIsHomeProcess = VALUE_FALSE;

            }
@@ -1059,7 +1058,6 @@ final class ProcessStateRecord { 
        if (mCachedIsPreviousProcess == VALUE_INVALID) {

            if (mApp.getWindowProcessController().isPreviousProcess()) {

                mCachedIsPreviousProcess = VALUE_TRUE;

                mService.mAppProfiler.mHasPreviousProcess = true;

            } else {

                mCachedIsPreviousProcess = VALUE_FALSE;

            }