From 3498e5398fec0396b2b98b46fec4e21f94b71a07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosmin=20B=C4=83ie=C8=99?= Date: Tue, 8 Aug 2023 15:52:02 +0200 Subject: [PATCH] Fix fallbackIMM#showSoftInput call Previously calls to fallbackIMM#showSoftInput would drop the statsToken and reason, as they would call a different variant of the function. This fixes it to ensure no statsToken can timeout in this case. Test: n/a Bug: 294992637 Change-Id: Ib6b1c0c1822be5de6b246a6c662d1d93ff4a0331 --- core/java/android/view/inputmethod/InputMethodManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index df9c26834fd47..31abac8550909 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -2165,7 +2165,7 @@ public final class InputMethodManager { // Re-dispatch if there is a context mismatch. final InputMethodManager fallbackImm = getFallbackInputMethodManagerIfNecessary(view); if (fallbackImm != null) { - return fallbackImm.showSoftInput(view, flags, resultReceiver); + return fallbackImm.showSoftInput(view, statsToken, flags, resultReceiver, reason); } checkFocus();