Merge "Protect bubble gesture monitor against re-entrant calls" into main (60cd9f22) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -2535,8 +2535,9 @@ public class BubbleStackView extends FrameLayout

		private void stopMonitoringSwipeUpGestureInternal() {
		if (mBubblesNavBarGestureTracker != null) {
		mBubblesNavBarGestureTracker.stop();
		final BubblesNavBarGestureTracker tracker = mBubblesNavBarGestureTracker;
		mBubblesNavBarGestureTracker = null;
		tracker.stop();
		setOnTouchListener(null);
		}
		}

+6 −2

Original line number	Diff line number	Diff line
		@@ -82,12 +82,16 @@ class BubblesNavBarGestureTracker {

		private void stopInternal() {
		if (mInputEventReceiver != null) {
		mInputEventReceiver.dispose();
		// Clear the field before calling dispose() to guard against re-entrant calls from it
		InputEventReceiver receiver = mInputEventReceiver;
		mInputEventReceiver = null;
		receiver.dispose();
		}
		if (mInputMonitor != null) {
		mInputMonitor.dispose();
		// Clear the field before calling dispose() to guard against re-entrant calls from it
		InputMonitor monitor = mInputMonitor;
		mInputMonitor = null;
		monitor.dispose();
		}
		}