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

Commit 0eb29f6d authored by Wally Yau's avatar Wally Yau
Browse files

Fixed dumping of Controller proto message 

If mController is not null, then "dumpsys activity --proto processes"
will cause the following exception

Exception occurred while dumping:
java.lang.IllegalArgumentException: Attempt to call write(long, String) with
   Message tag=37 fieldId=0x10b00000025

Bug: 135941071
Test: adb shell am monitor
      and run "adb shell dumpsys activity --proto processes" in another window
Change-Id: Ic476f09654b56e72172dd6ae03d19d775269de89
parent 1c61094c

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

+2 −1
Original line number Diff line number Diff line
@@ -7203,7 +7203,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                            ActivityManagerServiceDumpProcessesProto.VR_CONTROLLER);

                    if (mController != null) {

                        final long token = proto.start(CONTROLLER);

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

                        proto.write(ActivityManagerServiceDumpProcessesProto.Controller.CONTROLLER,

                                mController.toString());

                        proto.write(IS_A_MONKEY, mControllerIsAMonkey);

                        proto.end(token);

                    }