From 2fee4eb040c7dad6f911584e9ad6aa8523e593e7 Mon Sep 17 00:00:00 2001
From: Jagrut Desai <jagrutdesai@google.com>
Date: Mon, 29 Jan 2024 08:50:01 -0800
Subject: [PATCH] Fixing NullPointerException in TaskbarUIController

Test: Presubmit
Bug: 322617093
Flag: NONE
Change-Id: I648ff17bbc666f30bd43fdab3320d058ac9e1f9f
---
 .../src/com/android/launcher3/taskbar/TaskbarUIController.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java
index ecedf8ad60..bb2ac738c3 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java
@@ -93,6 +93,7 @@ public class TaskbarUIController {
     public void onTaskbarIconLaunched(ItemInfo item) {
         // When launching from Taskbar, e.g. from Overview, set FLAG_IN_APP immediately instead of
         // waiting for onPause, to reduce potential visual noise during the app open transition.
+        if (mControllers.taskbarStashController == null) return;
         mControllers.taskbarStashController.updateStateForFlag(FLAG_IN_APP, true);
         mControllers.taskbarStashController.applyState();
     }