Merge "Fix RemoteInputViewController using a different token than RemoteInputView" (54611d91) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputViewController.kt

+2 −3

Original line number	Diff line number	Diff line
		@@ -95,7 +95,6 @@ class RemoteInputViewControllerImpl @Inject constructor(
		private val uiEventLogger: UiEventLogger
		) : RemoteInputViewController {

		private object Token
		private val onSendListeners = ArraySet<OnSendRemoteInputListener>()
		private val resources get() = view.resources

		@@ -179,8 +178,8 @@ class RemoteInputViewControllerImpl @Inject constructor(

		entry.lastRemoteInputSent = SystemClock.elapsedRealtime()
		entry.mRemoteEditImeAnimatingAway = true
		remoteInputController.addSpinning(entry.key, Token)
		remoteInputController.removeRemoteInput(entry, Token)
		remoteInputController.addSpinning(entry.key, view.mToken)
		remoteInputController.removeRemoteInput(entry, view.mToken)
		remoteInputController.remoteInputSent(entry)
		entry.setHasSentReply()