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

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

am: Remove unused UidRecord fields 

Remove unused mCurAdj, mSetAdj, and mNumProcs fields from UidRecord.
These fields were no longer in use, simplifying the class.

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

Change-Id: I0114a499cdcb628bc9df88baa2a56a010903c6a6
parent b3d69dc3

core/proto/android/server/activitymanagerservice.proto

+1 −1
Original line number Diff line number Diff line
@@ -808,7 +808,7 @@ message UidRecordProto { 
        CHANGE_PROCADJ = 7;

    }

    repeated Change last_reported_changes = 8;

    optional int32 num_procs = 9;

    optional int32 num_procs = 9 [deprecated=true];



    message ProcStateSequence {

        option (.android.msg_privacy).dest = DEST_AUTOMATIC;

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

+5 −12
Original line number Diff line number Diff line
@@ -51,12 +51,6 @@ public final class UidRecord { 
    @CompositeRWLock({"mService", "mProcLock"})

    private boolean mProcAdjChanged;



    @CompositeRWLock({"mService", "mProcLock"})

    private int mCurAdj;



    @CompositeRWLock({"mService", "mProcLock"})

    private int mSetAdj;



    @CompositeRWLock({"mService", "mProcLock"})

    private int mCurCapability;
@@ -98,9 +92,6 @@ public final class UidRecord { 
    @CompositeRWLock({"mService", "mProcLock"})

    private boolean mSetIdle;



    @CompositeRWLock({"mService", "mProcLock"})

    private int mNumProcs;



    @CompositeRWLock({"mService", "mProcLock"})

    private ArraySet<ProcessRecord> mProcRecords = new ArraySet<>();
@@ -461,7 +452,6 @@ public final class UidRecord { 
            ProtoUtils.writeBitWiseFlagsToProtoEnum(proto, UidRecordProto.LAST_REPORTED_CHANGES,

                    mLastReportedChange, ORIG_ENUMS, PROTO_ENUMS);

        }

        proto.write(UidRecordProto.NUM_PROCS, mNumProcs);



        long seqToken = proto.start(UidRecordProto.NETWORK_STATE_UPDATE);

        proto.write(UidRecordProto.ProcStateSequence.CURURENT, curProcStateSeq);
@@ -543,8 +533,11 @@ public final class UidRecord { 
                sb.append("procadj");

            }

        }

        sb.append(" procs:");

        sb.append(mNumProcs);



        // Keep the legacy field to maintain backward compatibility for downstream readers.

        // TODO: b/425766486 - Remove the fixed string.

        sb.append(" procs:0");



        sb.append(" seq(");

        sb.append(curProcStateSeq);

        sb.append(",");