commit ab10c4caabb9fd25cc37ba0d79c843c4cbd1e288
author Remi NGUYEN VAN <reminv@google.com> Thu Feb 21 14:28:46 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Feb 21 14:28:46 2019 -0800
tree 6213269c08f2291ec1ad12cec4f9816d820347ea
parent 676e631646ad7a55208d74f2c0285e1af944df3c
parent 969abcc46fea8625688b8e401be6d0d1a56f3ad5

Merge "Add logging to NetworkStackClient"
am: 969abcc46f

Change-Id: I0fe820c6feab3caa9ad0739df100553b2d4374e0

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

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 3f91bb1..8b4a2dd 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -225,6 +225,7 @@
 import android.view.inputmethod.InputMethodManagerInternal;
 
 import com.android.internal.R;
+import com.android.internal.graphics.SfVsyncFrameCallbackProvider;
 import com.android.internal.os.IResultReceiver;
 import com.android.internal.policy.IKeyguardDismissCallback;
 import com.android.internal.policy.IShortcutService;
@@ -6691,9 +6692,6 @@
                     mRoot.forAllWindows(w -> {pw.println(w);}, true /* traverseTopToBottom */);
                 }
                 return;
-            } else if ("trace".equals(cmd)) {
-                // do nothing
-                return;
             } else {
                 // Dumping a single name?
                 if (!dumpWindows(pw, cmd, args, opti, dumpAll)) {