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

Commit a3b5f6c2 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 804aa297: am 01810bbb: am 06a591cd: Fix last change -- don\'t call...

am 804aa297: am 01810bbb: am 06a591cd: Fix last change -- don\'t call startInputInner() with lock held.

* commit '804aa297':
  Fix last change -- don't call startInputInner() with lock held.
parents 23677064 804aa297
Loading
Loading
Loading
Loading
+9 −4
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ public final class InputMethodManager {
                }
                case MSG_UNBIND: {
                    final int sequence = msg.arg1;
                    boolean startInput = false;
                    synchronized (mH) {
                        if (mBindSequence == sequence) {
                            if (false) {
@@ -356,9 +357,12 @@ public final class InputMethodManager {
                                mServedConnecting = true;
                            }
                            if (mActive) {
                                startInputInner();
                                startInput = true;
                            }
                        }
                    }
                    if (startInput) {
                        startInputInner();
                    }
                    return;
                }
@@ -1217,12 +1221,13 @@ public final class InputMethodManager {
                mService.windowGainedFocus(mClient, rootView.getWindowToken(),
                        focusedView != null, isTextEditor, softInputMode, first,
                        windowFlags);
                if (startInput) {
                    startInputInner();
                }
            } catch (RemoteException e) {
            }
        }

        if (startInput) {
            startInputInner();
        }
    }
    
    /** @hide */