Merge "Fix null-pointer in AbsSwipeUpHandler.buildAnimationController" into udc-dev am: 737c7f21ec am: 0f8401c721 am: 319a44a0ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23603592 Change-Id: I29b0e054534184a41da68c1e4d33b84ecbe93553 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user