commit acc4a81a9724ba0b4e87b53fe9a067b42fb95190
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jul 25 14:03:30 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 25 14:03:30 2024 +0000
tree 2f5eecec734b2a2c73fe60535173e15cc95079b8
parent fe7878c144fbab1b755436843266fdec52af1f80
parent 310e4c8038c209e18567580861fa2b4f49b6dabd

Merge "Fix NPE when activity launch options are created before taskbaer init" into main

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

diff --git a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
index 93a023d..252ebf7 100644
--- a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
@@ -272,6 +272,10 @@
      * app launch animation.
      */
     public void setIgnoreInAppFlagForSync(boolean enabled) {
+        if (mControllers == null) {
+            // This method can be called before init() is called.
+            return;
+        }
         mControllers.taskbarStashController.updateStateForFlag(FLAG_IGNORE_IN_APP, enabled);
     }