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

Commit d04c367e authored by Chih-Yu Huang's avatar Chih-Yu Huang
Browse files

psc: Use ProcessRecordInternal for specific OomAdjuster states 

Updates the OomAdjuster's GlobalState interface and related methods
to use ProcessRecordInternal instead of ProcessRecord for Home,
HeavyWeight, and Previous processes.

Bug: 425766486
Test: m services.core
Flag: EXEMPT pure refactor

Change-Id: Ic089a81ce54fafc7833977a67ed6af7552a0edc1
parent 16418fca

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

+6 −6
Original line number Diff line number Diff line
@@ -525,16 +525,16 @@ public abstract class OomAdjuster { 
        @Nullable ProcessRecord getTopProcess();



        /** The current Home process. */

        @Nullable ProcessRecord getHomeProcess();

        @Nullable ProcessRecordInternal getHomeProcess();



        /** The current Heavy Weight process. */

        @Nullable ProcessRecord getHeavyWeightProcess();

        @Nullable ProcessRecordInternal getHeavyWeightProcess();



        /** The current process showing UI if the device is in doze. */

        @Nullable ProcessRecord getShowingUiWhileDozingProcess();



        /** The previous process that showed an activity. */

        @Nullable ProcessRecord getPreviousProcess();

        @Nullable ProcessRecordInternal getPreviousProcess();

    }



    boolean isChangeEnabled(@CachedCompatChangeId int cachedCompatChangeId,
@@ -1891,7 +1891,7 @@ public abstract class OomAdjuster { 
        }

    }



    protected boolean isHomeProcess(ProcessRecord proc) {

    protected boolean isHomeProcess(ProcessRecordInternal proc) {

        if (Flags.pushActivityStateToOomadjuster()) {

            return mGlobalState.getHomeProcess() == proc;

        } else {
@@ -1899,7 +1899,7 @@ public abstract class OomAdjuster { 
        }

    }



    protected boolean isHeavyWeightProcess(ProcessRecord proc) {

    protected boolean isHeavyWeightProcess(ProcessRecordInternal proc) {

        if (Flags.pushActivityStateToOomadjuster()) {

            return mGlobalState.getHeavyWeightProcess() == proc;

        } else {
@@ -1915,7 +1915,7 @@ public abstract class OomAdjuster { 
        }

    }



    protected boolean isPreviousProcess(ProcessRecord proc) {

    protected boolean isPreviousProcess(ProcessRecordInternal proc) {

        if (Flags.pushActivityStateToOomadjuster()) {

            return mGlobalState.getPreviousProcess() == proc;

        } else {

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

+13 −11
Original line number Diff line number Diff line
@@ -195,10 +195,10 @@ public class ProcessStateController { 
        private boolean mUnlocking = false;

        private boolean mExpandedNotificationShade = false;

        private ProcessRecord mTopProcess = null;

        private ProcessRecord mHomeProcess = null;

        private ProcessRecord mHeavyWeightProcess = null;

        private ProcessRecordInternal mHomeProcess = null;

        private ProcessRecordInternal mHeavyWeightProcess = null;

        private ProcessRecord mShowingUiWhileDozingProcess = null;

        private ProcessRecord mPreviousProcess = null;

        private ProcessRecordInternal mPreviousProcess = null;



        private void commitStagedState() {

            mUnlocking = mUnlockingStaged;
@@ -235,12 +235,12 @@ public class ProcessStateController { 
        }



        @Nullable

        public ProcessRecord getHomeProcess() {

        public ProcessRecordInternal getHomeProcess() {

            return mHomeProcess;

        }



        @Nullable

        public ProcessRecord getHeavyWeightProcess() {

        public ProcessRecordInternal getHeavyWeightProcess() {

            return mHeavyWeightProcess;

        }
@@ -250,7 +250,7 @@ public class ProcessStateController { 
        }



        @Nullable

        public ProcessRecord getPreviousProcess() {

        public ProcessRecordInternal getPreviousProcess() {

            return mPreviousProcess;

        }

    }
@@ -275,17 +275,17 @@ public class ProcessStateController { 
    }



    @GuardedBy("mLock")

    private void setPreviousProcess(@Nullable ProcessRecord proc) {

    private void setPreviousProcess(@Nullable ProcessRecordInternal proc) {

        mGlobalState.mPreviousProcess = proc;

    }



    @GuardedBy("mLock")

    private void setHomeProcess(@Nullable ProcessRecord proc) {

    private void setHomeProcess(@Nullable ProcessRecordInternal proc) {

        mGlobalState.mHomeProcess = proc;

    }



    @GuardedBy("mLock")

    private void setHeavyWeightProcess(@Nullable ProcessRecord proc) {

    private void setHeavyWeightProcess(@Nullable ProcessRecordInternal proc) {

        mGlobalState.mHeavyWeightProcess = proc;

    }
@@ -890,7 +890,8 @@ public class ProcessStateController { 
        public void setPreviousProcessAsync(@Nullable WindowProcessController wpc) {

            if (!Flags.pushActivityStateToOomadjuster()) return;



            final ProcessRecord prev = wpc != null ? (ProcessRecord) wpc.mOwner : null;

            final ProcessRecordInternal prev = wpc != null

                    ? (ProcessRecordInternal) wpc.mOwner : null;

            getBatchSession().stage(() -> mPsc.setPreviousProcess(prev));

        }
@@ -901,7 +902,8 @@ public class ProcessStateController { 
        public void setHomeProcessAsync(@Nullable WindowProcessController wpc) {

            if (!Flags.pushActivityStateToOomadjuster()) return;



            final ProcessRecord home = wpc != null ? (ProcessRecord) wpc.mOwner : null;

            final ProcessRecordInternal home = wpc != null

                    ? (ProcessRecordInternal) wpc.mOwner : null;

            getBatchSession().stage(() -> mPsc.setHomeProcess(home));

        }