Merge "Revert "Fix the logics in ImeFocusController#onPostWindowFocus"" into rvc-dev

1 files changed, 1 insertions, 1 deletions

diff --git a/core/java/android/view/ImeFocusController.java b/core/java/android/view/ImeFocusController.java
index d6d9fc628ac9..dbbe4b61c81c 100644
--- a/core/java/android/view/ImeFocusController.java
+++ b/core/java/android/view/ImeFocusController.java
@@ -123,7 +123,7 @@ public final class ImeFocusController {
         }
         // Update mNextServedView when focusedView changed.
         final View viewForWindowFocus = focusedView != null ? focusedView : mViewRootImpl.mView;
-        onViewFocusChanged(viewForWindowFocus, viewForWindowFocus.hasFocus());
+        onViewFocusChanged(viewForWindowFocus, true);
 
         immDelegate.startInputAsyncOnWindowFocusGain(viewForWindowFocus,
                 windowAttribute.softInputMode, windowAttribute.flags, forceFocus);