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

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

psc: Move ProcessRecord.mPendingFinishAttach to ProcessRecordInternal 

The `mPendingFinishAttach` field and its accessor methods are moved
from `ProcessRecord` to `ProcessRecordInternal`.

Bug: 425766486
Test: m services.core
Test: atest MockingOomAdjusterTests OomAdjusterTests
Test: atest FrameworksServicesTestsRavenwood_ProcessStateController
Flag: EXEMPT pure refactor

Change-Id: Id48d42725e8a21b7bd139700bc6f470f01ea0d0b
parent b9484606

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

+1 −17
Original line number Diff line number Diff line
@@ -186,12 +186,6 @@ class ProcessRecord extends ProcessRecordInternal implements WindowProcessListen 
    @GuardedBy("mService")

    private boolean mPendingStart;



    /**

     * Process finish attach application is pending.

     */

    @GuardedBy("mService")

    private boolean mPendingFinishAttach;



    /**

     * Seq no. Indicating the latest process start associated with this process record.

     */
@@ -811,19 +805,9 @@ class ProcessRecord extends ProcessRecordInternal implements WindowProcessListen 
        mPendingStart = pendingStart;

    }



    @GuardedBy("mService")

    void setPendingFinishAttach(boolean pendingFinishAttach) {

        mPendingFinishAttach = pendingFinishAttach;

    }



    @GuardedBy("mService")

    boolean isPendingFinishAttach() {

        return mPendingFinishAttach;

    }



    @GuardedBy("mService")

    boolean isThreadReady() {

        return mThread != null && !mPendingFinishAttach;

        return mThread != null && !isPendingFinishAttach();

    }



    @GuardedBy("mService")

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

+2 −1
Original line number Diff line number Diff line
@@ -349,7 +349,8 @@ public class ProcessStateController { 
     * Note whether a process is pending attach or not.

     */

    @GuardedBy("mLock")

    public void setPendingFinishAttach(@NonNull ProcessRecord proc, boolean pendingFinishAttach) {

    public void setPendingFinishAttach(@NonNull ProcessRecordInternal proc,

            boolean pendingFinishAttach) {

        proc.setPendingFinishAttach(pendingFinishAttach);

    }

services/core/java/com/android/server/am/psc/ProcessRecordInternal.java

+14 −0
Original line number Diff line number Diff line
@@ -543,6 +543,10 @@ public abstract class ProcessRecordInternal { 
    @GuardedBy("mServiceLock")

    private boolean mHasRecentTask = false;



    /** Process finish attach application is pending. */

    @GuardedBy("mServiceLock")

    private boolean mPendingFinishAttach;



    // Below are the cached task info for OomAdjuster only

    private static final int VALUE_INVALID = -1;

    private static final int VALUE_FALSE = 0;
@@ -1393,6 +1397,16 @@ public abstract class ProcessRecordInternal { 
        mFollowupUpdateUptimeMs = updateUptimeMs;

    }



    @GuardedBy("mServiceLock")

    public void setPendingFinishAttach(boolean pendingFinishAttach) {

        mPendingFinishAttach = pendingFinishAttach;

    }



    @GuardedBy("mServiceLock")

    public boolean isPendingFinishAttach() {

        return mPendingFinishAttach;

    }



    /**

     * Performs cleanup operations on the ProcessRecordInternal when the application record is

     * cleaned up. This resets various state flags and adjustment values.