commit 2583fb48b8b3614543c973755133470e5d3d3364
author Tracy Zhou <tracyzhou@google.com> Tue Jun 07 22:45:47 2022 -0700
committer Tracy Zhou <tracyzhou@google.com> Thu Jun 09 19:22:31 2022 +0000
tree 3480999fb245fcc9cc6c184b1fa9e02e6f94f09b
parent 20b14804356b2addf5f958e7383786536c7412b4

Patch npe in TaskbarAllAppsController

b/234617317#comment3

Bug: 234617317
Test: manual
Change-Id: I7cff0df86db4fdf58b33240594784598950f1a88

quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java

diff --git a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java
index 6fd98db..c56ac5b 100644
--- a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsController.java
@@ -171,8 +171,8 @@
      * This method should be called after an exit animation finishes, if applicable.
      */
     void maybeCloseWindow() {
-        if (AbstractFloatingView.getOpenView(mAllAppsContext, TYPE_ALL) != null
-                || mAllAppsContext.getDragController().isSystemDragInProgress()) {
+        if (mAllAppsContext != null && (AbstractFloatingView.hasOpenView(mAllAppsContext, TYPE_ALL)
+                || mAllAppsContext.getDragController().isSystemDragInProgress())) {
             return;
         }
         mProxyView.close(false);