Merge "Fix null-pointer in AbsSwipeUpHandler.buildAnimationController" into udc-dev

This commit is contained in:
TreeHugger Robot authored and Android (Google) Code Review committed 2023-06-08 18:42:53 +00:00
commit 737c7f21ec
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