commit 632e9a84c4d7cb0f759d62f403fe7a8fd09d0aa5
author Tony Wickham <twickham@google.com> Fri Feb 03 17:55:30 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 03 17:55:30 2023 +0000
tree 845cb0a7dd30e52926c838c1c8def11fb49ce176
parent cbedc7ed084aec83560aa021a1087f3c64f2720b
parent 9fb88830175054405cca08d4c75f8b5947d0451f

Merge "Don't applyState if taskbar is already destroyed" into tm-qpr-dev

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
index 451d661..c6d8fce 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
@@ -547,6 +547,10 @@
         }
     }
 
+    public boolean isDestroyed() {
+        return mIsDestroyed;
+    }
+
     public void updateSysuiStateFlags(int systemUiStateFlags, boolean fromInit) {
         mControllers.navbarButtonsViewController.updateStateForSysuiFlags(systemUiStateFlags,
                 fromInit);

quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
index 3e51e67..63e1b4a 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
@@ -249,6 +249,9 @@
     }
 
     public Animator applyState(long duration, boolean start) {
+        if (mControllers.taskbarActivityContext.isDestroyed()) {
+            return null;
+        }
         Animator animator = null;
         if (mPrevState == null || mPrevState != mState) {
             // If this is our initial state, treat all flags as changed.