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

Commit eb1a99e1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add trim levels to writeToProto"

parents 4acbc89f 4921ccf5

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

+1 −1
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ class ActivityDisplay extends ConfigurationContainer<ActivityStack> { 


    public void writeToProto(ProtoOutputStream proto, long fieldId) {

        final long token = proto.start(fieldId);

        super.writeToProto(proto, CONFIGURATION_CONTAINER);

        super.writeToProto(proto, CONFIGURATION_CONTAINER, false /* trim */);

        proto.write(ID, mDisplayId);

        for (int stackNdx = mStacks.size() - 1; stackNdx >= 0; --stackNdx) {

            final ActivityStack stack = mStacks.get(stackNdx);

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

+1 −1
Original line number Diff line number Diff line
@@ -2821,7 +2821,7 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo 


    public void writeToProto(ProtoOutputStream proto, long fieldId) {

        final long token = proto.start(fieldId);

        super.writeToProto(proto, CONFIGURATION_CONTAINER);

        super.writeToProto(proto, CONFIGURATION_CONTAINER, false /* trim */);

        writeIdentifierToProto(proto, IDENTIFIER);

        proto.write(STATE, state.toString());

        proto.write(VISIBLE, visible);

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

+1 −1
Original line number Diff line number Diff line
@@ -5023,7 +5023,7 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai 


    public void writeToProto(ProtoOutputStream proto, long fieldId) {

        final long token = proto.start(fieldId);

        super.writeToProto(proto, CONFIGURATION_CONTAINER);

        super.writeToProto(proto, CONFIGURATION_CONTAINER, false /* trim */);

        proto.write(ID, mStackId);

        for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) {

            final TaskRecord task = mTaskHistory.get(taskNdx);

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

+1 −1
Original line number Diff line number Diff line
@@ -3692,7 +3692,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D 
    }



    public void writeToProto(ProtoOutputStream proto) {

        super.writeToProto(proto, CONFIGURATION_CONTAINER);

        super.writeToProto(proto, CONFIGURATION_CONTAINER, false /* trim */);

        for (int displayNdx = 0; displayNdx < mActivityDisplays.size(); ++displayNdx) {

            ActivityDisplay activityDisplay = mActivityDisplays.valueAt(displayNdx);

            activityDisplay.writeToProto(proto, DISPLAYS);

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

+1 −1
Original line number Diff line number Diff line
@@ -2205,7 +2205,7 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi 


    public void writeToProto(ProtoOutputStream proto, long fieldId) {

        final long token = proto.start(fieldId);

        super.writeToProto(proto, CONFIGURATION_CONTAINER);

        super.writeToProto(proto, CONFIGURATION_CONTAINER, false /* trim */);

        proto.write(ID, taskId);

        for (int i = mActivities.size() - 1; i >= 0; i--) {

            ActivityRecord activity = mActivities.get(i);