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

Commit 498e77e1 authored by sanryhuang's avatar sanryhuang
Browse files

Fix Activity[Task]ManagerService proto dumping code 

Move the proto code of SLEEP_STATUS to the right place.

Bug: 120245577
Test: atest ActivityManagerTest
Change-Id: Ic68971c55d13d3c775940c03c6e9938d083bee01
parent d2bc0b87

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

+1 −9
Original line number Diff line number Diff line
@@ -10376,7 +10376,7 @@ public class ActivityManagerService extends IActivityManager.Stub 














        writeProcessesToGcToProto(proto, ActivityManagerServiceDumpProcessesProto.GC_PROCS, dumpPackage);















        mAppErrors.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.APP_ERRORS, dumpPackage);













        mAtmInternal.writeProcessesToProto(proto, dumpPackage);













        mAtmInternal.writeProcessesToProto(proto, dumpPackage, mWakefulness, mTestPssMode);





























        if (dumpPackage == null) {















            mUserController.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.USER_CONTROLLER);










@@ -10406,14 +10406,6 @@ public class ActivityManagerService extends IActivityManager.Stub













            }















        }



























        if (dumpPackage == null) {













            final long sleepToken = proto.start(ActivityManagerServiceDumpProcessesProto.SLEEP_STATUS);













            proto.write(ActivityManagerServiceDumpProcessesProto.SleepStatus.WAKEFULNESS,













                    PowerManagerInternal.wakefulnessToProtoEnum(mWakefulness));













            proto.write(ActivityManagerServiceDumpProcessesProto.SleepStatus.TEST_PSS_MODE, mTestPssMode);













            proto.end(sleepToken);













        }



























        if (mDebugApp != null || mOrigDebugApp != null || mDebugTransient















                || mOrigWaitForDebugger) {















            if (dumpPackage == null || dumpPackage.equals(mDebugApp)

































services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -402,7 +402,8 @@ public abstract class ActivityTaskManagerInternal {













            int wakefulness);































    /** Writes the current window process states to the proto stream. */













    public abstract void writeProcessesToProto(ProtoOutputStream proto, String dumpPackage);













    public abstract void writeProcessesToProto(ProtoOutputStream proto, String dumpPackage,













            int wakeFullness, boolean testPssMode);































    /** Dump the current activities state. */















    public abstract boolean dumpActivity(FileDescriptor fd, PrintWriter pw, String name,

































services/core/java/com/android/server/wm/ActivityTaskManagerService.java



+22
−15




























Original line number
Diff line number
Diff line








@@ -4701,26 +4701,21 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {













        }















    }





























    void writeSleepStateToProto(ProtoOutputStream proto) {













    private void writeSleepStateToProto(ProtoOutputStream proto, int wakeFullness,













            boolean testPssMode) {













        final long sleepToken = proto.start(ActivityManagerServiceDumpProcessesProto.SLEEP_STATUS);













        proto.write(ActivityManagerServiceDumpProcessesProto.SleepStatus.WAKEFULNESS,













                PowerManagerInternal.wakefulnessToProtoEnum(wakeFullness));















        for (ActivityTaskManagerInternal.SleepToken st : mRootActivityContainer.mSleepTokens) {















            proto.write(ActivityManagerServiceDumpProcessesProto.SleepStatus.SLEEP_TOKENS,















                    st.toString());















        }



























        if (mRunningVoice != null) {













            final long vrToken = proto.start(













                    ActivityManagerServiceDumpProcessesProto.RUNNING_VOICE);













            proto.write(ActivityManagerServiceDumpProcessesProto.Voice.SESSION,













                    mRunningVoice.toString());













            mVoiceWakeLock.writeToProto(













                    proto, ActivityManagerServiceDumpProcessesProto.Voice.WAKELOCK);













            proto.end(vrToken);













        }





























        proto.write(ActivityManagerServiceDumpProcessesProto.SleepStatus.SLEEPING, mSleeping);















        proto.write(ActivityManagerServiceDumpProcessesProto.SleepStatus.SHUTTING_DOWN,















                mShuttingDown);













        mVrController.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.VR_CONTROLLER);













        proto.write(ActivityManagerServiceDumpProcessesProto.SleepStatus.TEST_PSS_MODE,













                testPssMode);













        proto.end(sleepToken);















    }































    int getCurrentUserId() {










@@ -6599,12 +6594,24 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {













        }































        @Override













        public void writeProcessesToProto(ProtoOutputStream proto, String dumpPackage) {













        public void writeProcessesToProto(ProtoOutputStream proto, String dumpPackage,













                int wakeFullness, boolean testPssMode) {















            synchronized (mGlobalLock) {















                if (dumpPackage == null) {















                    getGlobalConfiguration().writeToProto(proto, GLOBAL_CONFIGURATION);















                    proto.write(CONFIG_WILL_CHANGE, getTopDisplayFocusedStack().mConfigWillChange);













                    writeSleepStateToProto(proto);













                    writeSleepStateToProto(proto, wakeFullness, testPssMode);













                    if (mRunningVoice != null) {













                        final long vrToken = proto.start(













                                ActivityManagerServiceDumpProcessesProto.RUNNING_VOICE);













                        proto.write(ActivityManagerServiceDumpProcessesProto.Voice.SESSION,













                                mRunningVoice.toString());













                        mVoiceWakeLock.writeToProto(













                                proto, ActivityManagerServiceDumpProcessesProto.Voice.WAKELOCK);













                        proto.end(vrToken);













                    }













                    mVrController.writeToProto(proto,













                            ActivityManagerServiceDumpProcessesProto.VR_CONTROLLER);















                    if (mController != null) {















                        final long token = proto.start(CONTROLLER);















                        proto.write(CONTROLLER, mController.toString());