Merge "Fix null-pointer in AbsSwipeUpHandler.buildAnimationController" into udc-dev am: 737c7f21ec am: 0f8401c721

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

Change-Id: Id12062a8e38a150644a0420c58ebbb0a009fe28d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-06-08 19:50:57 +00:00
committed by Automerger Merge Worker
@@ -831,7 +831,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
* @return Whether we can create the launcher controller or update its progress.
*/
private boolean canCreateNewOrUpdateExistingLauncherTransitionController() {
return mGestureState.getEndTarget() != HOME && !mHasEndedLauncherTransition;
return mGestureState.getEndTarget() != HOME
&& !mHasEndedLauncherTransition && mActivity != null;
}
@Override