commit f7b3bdb53bab9dfee3bcbba500f3f538cb00a737
author Kiyoung Kim <kiyoungkim@google.com> Wed Feb 20 16:38:08 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Feb 20 16:38:08 2019 -0800
tree 79d1506d25f7f2886dc4d972ab1460e4e859024a
parent c850654edc1760f0f529fbcd50d51b195e210e13
parent 03c14760a593b8bbea502fc8cbcc0ffe1e2ac058

Merge "Schematize Crypto system properties"
am: 03c14760a5

Change-Id: Ic0bb3a6f206c68ce705c572ad5714475690a3b1c

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