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

Commit 80e02c8b authored by Tarandeep Singh's avatar Tarandeep Singh Committed by android-build-merger
Browse files

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

am: ad0a4a22

Change-Id: Id4551d19bc2c05476c311a888a08aa8f5d449d20
parents fb349b27 ad0a4a22

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

+12 −8
Original line number Diff line number Diff line
@@ -655,6 +655,7 @@ 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)) {
@@ -664,7 +665,6 @@ public final class InputMethodManager { 
                            startInputInner(reason, null, 0, 0, 0);

                        }

                    }

                    }

                    return;

                }

                case MSG_SEND_INPUT_EVENT: {
@@ -1225,6 +1225,10 @@ 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;