From 9086f88aeba24cddb1b83623c6afc7966eed10c6 Mon Sep 17 00:00:00 2001
From: Ajinkya Chalke <achalke@google.com>
Date: Thu, 8 May 2025 12:53:50 +0000
Subject: [PATCH] Set uiController only in RecentsWindowManager

Fix: 414724376
Test: m
Flag: EXEMPT fixing a recently added logic
Change-Id: I5c489252dd5b8f917c2a278d217f68d8260e4fcc
---
 .../taskbar/LauncherTaskbarUIController.java       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
index 639eb4823d..bd91c990a6 100644
--- a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
@@ -55,6 +55,7 @@ import com.android.quickstep.LauncherActivityInterface;
 import com.android.quickstep.OverviewComponentObserver;
 import com.android.quickstep.RecentsAnimationCallbacks;
 import com.android.quickstep.SystemUiProxy;
+import com.android.quickstep.fallback.window.RecentsWindowManager;
 import com.android.quickstep.util.SplitTask;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.RecentsViewContainer;
@@ -123,16 +124,15 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
         int displayId = taskbarContext.getDisplayId();
         BaseContainerInterface<?, ?> containerInterface = OverviewComponentObserver.INSTANCE.get(
                 taskbarContext).getContainerInterface(displayId);
-        if (containerInterface != null) {
-            mRecentsViewContainer = containerInterface.getCreatedContainer();
-        }
-        if (mRecentsViewContainer == null) {
+        if (containerInterface != null
+                && containerInterface.getCreatedContainer()
+                instanceof RecentsWindowManager recentsWindowManager) {
+            mRecentsViewContainer = recentsWindowManager;
+            mRecentsViewContainer.setTaskbarUIController(this);
+        } else {
             mRecentsViewContainer = mLauncher;
         }
         mLauncher.setTaskbarUIController(this);
-        if (mRecentsViewContainer != mLauncher) {
-            mRecentsViewContainer.setTaskbarUIController(this);
-        }
 
         mHomeState.addListener(mVisibilityChangeListener);
         onLauncherVisibilityChanged(mHomeState.isHomeVisible(), true /* fromInit */);