Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9494c9db authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

DO NOT MERGE: Revert: Freeup lock when IME is set inactive and unbound 

Reason for revert:
Caused an unexpected regression Bug 144174015

Bug: 139806621
Bug: 144103599
Fix: 144174015
Test: Manually verified Bug 144174015 disappeared as follows
 1. Open Gmail then start composing an email
 2. Swipe up the home button to recents then re-launch Gmail
 3. Do the step 2 several times.
 4. Make sure that you can still type something on Gmail.
Change-Id: I04a77afea17f9d3eb05017fa00313fad4e48cd5c
parent c53b7367

core/java/android/view/inputmethod/InputMethodManager.java

+8 −12
Original line number Diff line number Diff line
@@ -655,7 +655,6 @@ public final class InputMethodManager { 
                            } catch (RemoteException e) {

                            }

                        }

                    }

                        // Check focus again in case that "onWindowFocus" is called before

                        // handling this message.

                        if (mServedView != null && canStartInput(mServedView)) {
@@ -665,6 +664,7 @@ public final class InputMethodManager { 
                                startInputInner(reason, null, 0, 0, 0);

                            }

                        }

                    }

                    return;

                }

                case MSG_SEND_INPUT_EVENT: {
@@ -1225,10 +1225,6 @@ public final class InputMethodManager { 
     */

    void clearBindingLocked() {

        if (DEBUG) Log.v(TAG, "Clearing binding!");

        if (mWindowFocusGainFuture != null) {

            mWindowFocusGainFuture.cancel(false /* mayInterruptIfRunning */);

            mWindowFocusGainFuture = null;

        }

        clearConnectionLocked();

        setInputChannelLocked(null);

        mBindSequence = -1;