Merge "Fix BackAnimationController race condition" into main (61d48932) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -332,8 +332,12 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont

		@Override
		public void onThresholdCrossed() {
		if (predictiveBackDelayWmTransition()) {
		mShellExecutor.execute(BackAnimationController.this::onThresholdCrossed);
		} else {
		BackAnimationController.this.onThresholdCrossed();
		}
		}

		@Override
		public void setTriggerBack(boolean triggerBack) {

+6 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import static android.view.MotionEvent.TOOL_TYPE_FINGER;
		import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_EXCLUDE_FROM_SCREEN_MAGNIFICATION;

		import static com.android.systemui.Flags.edgebackGestureHandlerGetRunningTasksBackground;
		import static com.android.systemui.Flags.predictiveBackDelayWmTransition;
		import static com.android.systemui.classifier.Classifier.BACK_GESTURE;
		import static com.android.systemui.navigationbar.gestural.Utilities.isTrackpadThreeFingerSwipe;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_TOUCHPAD_GESTURES_DISABLED;
		@@ -1182,6 +1183,9 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
		return;
		} else if (dx > dy && dx > mTouchSlop) {
		if (mAllowGesture) {
		if (!predictiveBackDelayWmTransition() && mBackAnimation != null) {
		mBackAnimation.onThresholdCrossed();
		}
		if (mBackAnimation == null) {
		pilferPointers();
		}
		@@ -1197,7 +1201,8 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack
		// forward touch
		mEdgeBackPlugin.onMotionEvent(ev);
		dispatchToBackAnimation(ev);
		if (mBackAnimation != null && mThresholdCrossed && !mLastFrameThresholdCrossed) {
		if (predictiveBackDelayWmTransition() && mBackAnimation != null
		&& mThresholdCrossed && !mLastFrameThresholdCrossed) {
		mBackAnimation.onThresholdCrossed();
		}
		}