commit 18a1aa543b57bec8bb0bac6cf4364cf3baaa6812
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jan 05 21:15:59 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 05 21:15:59 2021 +0000
tree 54fd8731730233160b3aede5ffd189eab1df1ce0
parent 6511fd5b40e3cd6553ca8328d5f4c90057141ea3
parent 9b1e77377b22de9ab200f755550d2a4a4f5b099f

Merge "Removing shelf from 2-button gesture mode"

quickstep/src/com/android/quickstep/OverviewCommandHelper.java

diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index 2559a6f..fd9c315 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -175,8 +175,7 @@
                 return;
             }
 
-            InteractionJankMonitorWrapper.begin(
-                    InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH, 2000 /* ms timout */);
+            InteractionJankMonitorWrapper.begin(InteractionJankMonitorWrapper.CUJ_QUICK_SWITCH);
 
             // Otherwise, start overview.
             mListener = mActivityInterface.createActivityInitListener(this::onActivityReady);