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

This commit is contained in:
TreeHugger Robot authored and Android (Google) Code Review committed 2021-08-06 05:06:54 +00:00
commit 5a25696bfd
1 file changed
+3 -1
@@ -1534,7 +1534,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
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) {