Merge "Patch npe in TaskbarAllAppsController" into tm-qpr-dev

2022-06-09 22:12:08 +00:00
parent b17399e54c 2583fb48b8
commit c3ba24f06e
1 changed files with 2 additions and 2 deletions
@@ -171,8 +171,8 @@ public final class TaskbarAllAppsController {
     * 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);