From 067d71bc315335b48818898a57c3e3e4d4bbf66e Mon Sep 17 00:00:00 2001
From: Yohei Yukawa <yukawa@google.com>
Date: Thu, 16 Apr 2020 19:40:46 +0000
Subject: Revert "Fix the logics in ImeFocusController#onPostWindowFocus"

This reverts commit a56779d1ab1f73385881cab4a945f376df27a84c [1].

Reason for revert:
Caused multiple test failures in CtsInputMethodTestCases

 [1]: I68bb95fc3cbfe1f5992ccf87694b34c3e52bb31f

Bug: 153612876
Fix: 154250671
Test: atest CtsInputMethodTestCases
Change-Id: Ibf6143f46ae18e41e8ecfa50f523216e7340adda
---
 core/java/android/view/ImeFocusController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
-- 
cgit v1.2.3-59-g8ed1b