Merge "Check IME info nullability before switching" into main (605ae018) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -4233,6 +4233,9 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		@NonNull UserData userData) {
		final var bindingController = userData.mBindingController;
		final var currentImi = bindingController.getSelectedMethod();
		if (currentImi == null) {
		return false;
		}
		final ImeSubtypeListItem nextSubtype = userData.mSwitchingController
		.getNextInputMethodLocked(onlyCurrentIme, currentImi,
		bindingController.getCurrentSubtype(),
		@@ -4250,6 +4253,9 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
		private boolean shouldOfferSwitchingToNextInputMethodLocked(@NonNull UserData userData) {
		final var bindingController = userData.mBindingController;
		final var currentImi = bindingController.getSelectedMethod();
		if (currentImi == null) {
		return false;
		}
		final ImeSubtypeListItem nextSubtype = userData.mSwitchingController
		.getNextInputMethodLocked(false /* onlyCurrentIme */, currentImi,
		bindingController.getCurrentSubtype(),

+1 −4

Original line number	Diff line number	Diff line
		@@ -686,11 +686,8 @@ final class InputMethodSubtypeSwitchingController {
		*/
		@Nullable
		public ImeSubtypeListItem getNextInputMethodLocked(boolean onlyCurrentIme,
		@Nullable InputMethodInfo imi, @Nullable InputMethodSubtype subtype,
		@NonNull InputMethodInfo imi, @Nullable InputMethodSubtype subtype,
		@SwitchMode int mode, boolean forward) {
		if (imi == null) {
		return null;
		}
		if (Flags.imeSwitcherRevamp()) {
		return mRotationList.next(imi, subtype, onlyCurrentIme,
		isRecency(mode, forward), forward);