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

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

psc: Move and refactor getUidRecord to ProcessRecordInternal 

Move `getUidRecord()` from `ProcessRecord` to its superclass
`ProcessRecordInternal`. Update the method signature in
`ProcessRecordInternal` and its callers to return `UidRecordInternal`.
This change standardizes the use of the internal representation for
UidRecord across relevant internal components.

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

Change-Id: I9aafda0bc52b5a7f1339a3316842b35c0727d529
parent 96690b6b

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

+1 −1
Original line number Diff line number Diff line
@@ -770,7 +770,7 @@ public abstract class OomAdjuster { 
        // Scan downstreams of the process record

        for (ProcessRecord pr = queue.poll(); pr != null; pr = queue.poll()) {

            processes.add(pr);

            final UidRecord uidRec = pr.getUidRecord();

            final UidRecordInternal uidRec = pr.getUidRecord();

            if (uidRec != null) {

                uids.put(uidRec.getUid(), uidRec);

            }

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

+1 −2
Original line number Diff line number Diff line
@@ -641,8 +641,7 @@ public class OomAdjusterImpl extends OomAdjuster { 
            // This process was updated in some way, mark that it was last calculated this sequence.

            app.setCompletedAdjSeq(mAdjSeq);

            if (uids != null) {

                final UidRecord uidRec = app.getUidRecord();



                final UidRecordInternal uidRec = app.getUidRecord();

                if (uidRec != null) {

                    uids.put(uidRec.getUid(), uidRec);

                }

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

+1 −1
Original line number Diff line number Diff line
@@ -5620,7 +5620,7 @@ public final class ProcessList { 
     */

    @GuardedBy("mService")

    long killAppIfBgRestrictedAndCachedIdleLocked(ProcessRecord app, long nowElapsed) {

        final UidRecord uidRec = app.getUidRecord();

        final UidRecordInternal uidRec = app.getUidRecord();

        final long lastCachedTime = app.getLastCachedTime();

        if (!mService.mConstants.mKillBgRestrictedAndCachedIdle

                || app.isKilled() || app.getThread() == null || uidRec == null || !uidRec.isIdle()

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

+2 −1
Original line number Diff line number Diff line
@@ -655,8 +655,9 @@ class ProcessRecord extends ProcessRecordInternal implements WindowProcessListen 
        mErrorState.setCrashing(false);

    }



    @Override

    @GuardedBy(anyOf = {"mService", "mProcLock"})

    UidRecord getUidRecord() {

    public UidRecord getUidRecord() {

        return mUidRecord;

    }

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

+3 −0
Original line number Diff line number Diff line
@@ -223,6 +223,9 @@ public abstract class ProcessRecordInternal { 
     */

    public abstract int getApplicationUid();



    /** Returns the {@link UidRecordInternal} associated with this process. */

    public abstract UidRecordInternal getUidRecord();



    // Enable this to trace all OomAdjuster state transitions

    private static final boolean TRACE_OOM_ADJ = false;