commit f1d3b8da7e69196ca8aca98a170f59957bb4c19b
author Nicolas Geoffray <ngeoffray@google.com> Thu Feb 21 10:39:55 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Feb 21 10:39:55 2019 -0800
tree 8959e6b9e1a2c383818415c22c5c8b80b956f74b
parent a96e3dfb81a90d5daaabaa6e8a19cc401b780a76
parent 4e4b3ac9c5d9b27d23f34766117e3e9782e526c3

Merge "Pick up the apexBootImage pinner service files when the boot image is apex.art."
am: 4e4b3ac9c5

Change-Id: I08391ceeb39dc0ab71f5c73be97b8be735a1b35e

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