commit 463a40fdb3cea6f84774fe3dbdfda4b0ee76dc5d
author Tony Wickham <twickham@google.com> Sat Nov 02 00:36:21 2024 +0000
committer Tony Wickham <twickham@google.com> Mon Nov 04 20:01:14 2024 +0000
tree ac46eb096a922d0e884c34c98b3949a0f7c29fa5
parent 87455f28fcbfd828612850ea6ebf59da19c6fd83

Handle null RecentsView in FallbackTaskbarUIController

Test: not crashing
Flag: com.android.launcher3.enable_fallback_overview_in_window
Bug: 365775636
Change-Id: I98c52cc09f1ca686ce3844044bbf734ef0b05e59

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

diff --git a/quickstep/src/com/android/launcher3/taskbar/FallbackTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/FallbackTaskbarUIController.java
index e3bcb0d..6a908ca 100644
--- a/quickstep/src/com/android/launcher3/taskbar/FallbackTaskbarUIController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/FallbackTaskbarUIController.java
@@ -50,8 +50,12 @@
                 public void onStateTransitionStart(RecentsState toState) {
                     animateToRecentsState(toState);
 
+                    RecentsView recentsView = getRecentsView();
+                    if (recentsView == null) {
+                        return;
+                    }
                     // Handle tapping on live tile.
-                    getRecentsView().setTaskLaunchListener(toState == RecentsState.DEFAULT
+                    recentsView.setTaskLaunchListener(toState == RecentsState.DEFAULT
                             ? (() -> animateToRecentsState(RecentsState.BACKGROUND_APP)) : null);
                 }
 
@@ -81,7 +85,10 @@
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        getRecentsView().setTaskLaunchListener(null);
+        RecentsView recentsView = getRecentsView();
+        if (recentsView != null) {
+            recentsView.setTaskLaunchListener(null);
+        }
         mRecentsContainer.setTaskbarUIController(null);
         mRecentsContainer.getStateManager().removeStateListener(mStateListener);
     }
@@ -112,7 +119,7 @@
     }
 
     @Override
-    public RecentsView getRecentsView() {
+    public @Nullable RecentsView getRecentsView() {
         return mRecentsContainer.getOverviewPanel();
     }