From 9c18ce48717c6293cc8ca5836bad54117271d556 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Thu, 22 Jun 2023 10:43:40 -0700
Subject: [PATCH] Remove unnecessary method from StatefulActivity

Flag: not needed
Fixes: 284920213
Test: quickly tapped overview button and quickly tapped scrim; added logs to check error case
Change-Id: I6cb66012379d30e8ce91533a9f4350bf309f1341
---
 .../android/launcher3/uioverrides/QuickstepLauncher.java    | 4 +---
 quickstep/src/com/android/quickstep/RecentsActivity.java    | 4 +---
 .../com/android/quickstep/fallback/FallbackRecentsView.java | 2 +-
 .../com/android/quickstep/views/LauncherRecentsView.java    | 2 +-
 quickstep/src/com/android/quickstep/views/RecentsView.java  | 2 +-
 .../android/launcher3/statemanager/StatefulActivity.java    | 6 ------
 6 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 512d5f4014..a5ba8158b2 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -1305,11 +1305,9 @@ public class QuickstepLauncher extends Launcher {
                                 : groupTask.mSplitBounds.leftTaskPercent);
     }
 
-    @Override
     public boolean isCommandQueueEmpty() {
         OverviewCommandHelper overviewCommandHelper = mTISBindHelper.getOverviewCommandHelper();
-        return super.isCommandQueueEmpty()
-                && (overviewCommandHelper == null || overviewCommandHelper.isCommandQueueEmpty());
+        return overviewCommandHelper == null || overviewCommandHelper.isCommandQueueEmpty();
     }
 
     private static final class LauncherTaskViewController extends
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index e282d1fffb..8a9c3c826a 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -467,10 +467,8 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
         };
     }
 
-    @Override
     public boolean isCommandQueueEmpty() {
         OverviewCommandHelper overviewCommandHelper = mTISBindHelper.getOverviewCommandHelper();
-        return super.isCommandQueueEmpty()
-                && (overviewCommandHelper == null || overviewCommandHelper.isCommandQueueEmpty());
+        return overviewCommandHelper == null || overviewCommandHelper.isCommandQueueEmpty();
     }
 }
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
index a9a57c6c2d..7dc8347419 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
@@ -86,7 +86,7 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity, RecentsSta
     }
 
     @Override
-    public boolean isCommandQueueEmpty() {
+    protected boolean isCommandQueueEmpty() {
         return mActivity.isCommandQueueEmpty();
     }
 
diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
index 9e9b22f3ac..3ee900999e 100644
--- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -90,7 +90,7 @@ public class LauncherRecentsView extends RecentsView<QuickstepLauncher, Launcher
     }
 
     @Override
-    public boolean isCommandQueueEmpty() {
+    protected boolean isCommandQueueEmpty() {
         return mActivity.isCommandQueueEmpty();
     }
 
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index f0daf8d848..421a48c25d 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2374,7 +2374,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
     protected abstract void handleStartHome(boolean animated);
 
     /** Returns whether the overview command helper queue is empty. */
-    public abstract boolean isCommandQueueEmpty();
+    protected abstract boolean isCommandQueueEmpty();
 
     public void reset() {
         setCurrentTask(-1);
diff --git a/src/com/android/launcher3/statemanager/StatefulActivity.java b/src/com/android/launcher3/statemanager/StatefulActivity.java
index de5887f759..520f33ca74 100644
--- a/src/com/android/launcher3/statemanager/StatefulActivity.java
+++ b/src/com/android/launcher3/statemanager/StatefulActivity.java
@@ -237,10 +237,4 @@ public abstract class StatefulActivity<STATE_TYPE extends BaseState<STATE_TYPE>>
      * @param leftOrTop if the staged split will be positioned left or top.
      */
     public void enterStageSplitFromRunningApp(boolean leftOrTop) { }
-
-
-    /** Returns whether the overview command helper queue is empty. */
-    public boolean isCommandQueueEmpty() {
-        return true;
-    }
 }