From 0eb29f6d40cfd86746201c084467f27c90f1f41a Mon Sep 17 00:00:00 2001 From: Wally Yau Date: Wed, 8 Jan 2020 10:16:43 -0800 Subject: [PATCH] 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 --- .../java/com/android/server/wm/ActivityTaskManagerService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 76c0e4eeecae6..474c5c960eb04 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -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); }