Commit 734613a5 authored Feb 01, 2022 by Adrian Roos

IME: Fix broken IME when detaching served (but not next served) view

Fixes an issue where if the mServedView gets detached, but a different
view was already set as the mNextServedView, the next served view gets
mistakenly cleared as well.

Fixes: 216548832
Bug: 211105987
Test: atest ImeFocusControllerTest
Change-Id: I3fe42bcb5b08158cbdbf261ba0227075464ffe4c

parent 9aac3354

core/java/android/view/ImeFocusController.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -203,8 +203,10 @@ public final class ImeFocusController {
		if (!getImmDelegate().isCurrentRootView(view.getViewRootImpl())) {
		return;
		}
		if (mServedView == view) {
		if (mNextServedView == view) {
		mNextServedView = null;
		}
		if (mServedView == view) {
		mViewRootImpl.dispatchCheckFocus();
		}
		}