commit e34896af249ffc116b18e1ceddb9658473fc6a8f
author Chiachang Wang <chiachangwang@google.com> Thu Feb 21 03:54:53 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Feb 21 03:54:53 2019 -0800
tree e14ca8c3c72abc737b29744dcfb3abf983690439
parent f7b3bdb53bab9dfee3bcbba500f3f538cb00a737
parent fc0708615c28eaa48bdbb6bf259463a086ce1517

Merge "Fix build warnings for CaptivePortalLogin"
am: fc0708615c

Change-Id: I96043c23bf3861c958ffd014e450728b665680e6

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)) {