From 5433bcac84355a0787b0cacd0e449384a69ad915 Mon Sep 17 00:00:00 2001 From: Nataniel Borges Date: Fri, 4 Jan 2019 15:46:08 -0800 Subject: [PATCH] Remove conflicting parameter "a" from WMService dump The parameter "a" was simultaneously declared as short version for the parameters "animator" and for "all". Due to the If-Else chain the parameter parameter was equivalent to "animator" and not "all". Test: Run "adb shell dumpsys window a". Check if it dumps the animator content. To dump all content use "adb shell dumpsys window all". Change-Id: Icc8a53c74e565cfc012284418798812b8206919e --- .../core/java/com/android/server/wm/WindowManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index b6a4a51c41f28..62426d28735bf 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -6158,7 +6158,7 @@ public class WindowManagerService extends IWindowManager.Stub dumpWindowsLocked(pw, true, null); } return; - } else if ("all".equals(cmd) || "a".equals(cmd)) { + } else if ("all".equals(cmd)) { synchronized (mGlobalLock) { dumpWindowsLocked(pw, true, null); }