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

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

Change-Id: Id66948a7288ff85e070e364088b8dbc898b95057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot authored and Automerger Merge Worker committed 2023-06-08 19:02:03 +00:00
commit 03d2155829
1 file changed
+2 -1
@@ -830,7 +830,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