Merge "Add null check when settling on LAST_TASK" into sc-v2-dev (d48fbecd) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -961,8 +961,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
		} else {
		mStateCallback.setState(STATE_RESUME_LAST_TASK);
		}
		if (mRecentsAnimationTargets != null) {
		TaskViewUtils.setSplitAuxiliarySurfacesShown(
		mRecentsAnimationTargets.nonApps, true);
		}
		break;
		}
		ActiveGestureLog.INSTANCE.addLog("onSettledOnEndTarget " + endTarget);