diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 2d58a6b..1ded4dd 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -61,8 +61,6 @@
 @TargetApi(Build.VERSION_CODES.O)
 public class TouchInteractionService extends Service {
 
-    public static final boolean DEBUG_OPEN_OVERVIEW_VIA_ALT_TAB = false;
-
     private static final SparseArray<String> sMotionEventNames;
 
     static {
@@ -133,21 +131,17 @@
 
         @Override
         public void onOverviewShown(boolean triggeredFromAltTab) {
-            if (DEBUG_OPEN_OVERVIEW_VIA_ALT_TAB) {
-                if (triggeredFromAltTab) {
-                    setupTouchConsumer(HIT_TARGET_NONE);
-                    mEventQueue.onOverviewShownFromAltTab();
-                }
+            if (triggeredFromAltTab) {
+                setupTouchConsumer(HIT_TARGET_NONE);
+                mEventQueue.onOverviewShownFromAltTab();
             }
         }
 
         @Override
         public void onOverviewHidden(boolean triggeredFromAltTab, boolean triggeredFromHomeKey) {
-            if (DEBUG_OPEN_OVERVIEW_VIA_ALT_TAB) {
-                if (triggeredFromAltTab && !triggeredFromHomeKey) {
-                    // onOverviewShownFromAltTab initiates quick scrub. Ending it here.
-                    mEventQueue.onQuickScrubEnd();
-                }
+            if (triggeredFromAltTab && !triggeredFromHomeKey) {
+                // onOverviewShownFromAltTab initiates quick scrub. Ending it here.
+                mEventQueue.onQuickScrubEnd();
             }
         }
 
