Merge "Pass statsToken from IMM to InsetsController when calling show/hide" into main
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index b281015..23d7732 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -1365,10 +1365,10 @@
ImeTracker.PHASE_CLIENT_HANDLE_SET_IME_VISIBILITY);
if (visible) {
insetsController.show(WindowInsets.Type.ime(),
- false /* fromIme */, null /* statsToken */);
+ false /* fromIme */, statsToken);
} else {
insetsController.hide(WindowInsets.Type.ime(),
- false /* fromIme */, null /* statsToken */);
+ false /* fromIme */, statsToken);
}
}
} else {