commit 5a25696bfd21a21e92b9f817769c491e7a127323
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Aug 06 05:06:54 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 06 05:06:54 2021 +0000
tree abd4e7b3091ebe7b072d00e8b5de63dfbfde3e57
parent 9b762e97783e90dd87397fb46a864676d895a18b
parent 6368746a3c86878209dbcbe0a996cd5aaa252bbc

Merge "Prevent NPE when resetting divider bar visibility" into sc-v2-dev

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 6249e6a..42c89fd 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1534,7 +1534,9 @@
         boolean wasVisible = mWasLauncherAlreadyVisible || mGestureStarted;
         mActivityInterface.onTransitionCancelled(wasVisible, mGestureState.getEndTarget());
 
-        TaskViewUtils.setDividerBarShown(mRecentsAnimationTargets.nonApps, true);
+        if (mRecentsAnimationTargets != null) {
+            TaskViewUtils.setDividerBarShown(mRecentsAnimationTargets.nonApps, true);
+        }
 
         // Leave the pending invisible flag, as it may be used by wallpaper open animation.
         if (mActivity != null) {