Make sure IME focus is synced to View focus
am: 8eb07090a4

Change-Id: Ia0db5adc86c72f122a5b9bab91962ffa2923469a
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 881aada..9f86d87 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -9817,6 +9817,9 @@
     public void dispatchFinishTemporaryDetach() {
         onFinishTemporaryDetach();
         mPrivateFlags3 &= ~PFLAG3_TEMPORARY_DETACH;
+        if (hasWindowFocus() && hasFocus()) {
+            InputMethodManager.getInstance().focusIn(this);
+        }
     }
 
     /**