Merge "Prevent NPE when resetting divider bar visibility" into sc-v2-dev am: 5a25696bfd

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15472699

Change-Id: Id99dd83824f2ebcbf80428f7877d9713a757d3a1
This commit is contained in:
TreeHugger Robot
2021-08-06 05:22:58 +00:00
committed by Automerger Merge Worker
@@ -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) {