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

Commit 7bf6814b authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 5c55c40b: Merge "Clear IMM references when window dismissed." into jb-dev 

* commit '5c55c40b':
  Clear IMM references when window dismissed.
parents d99ca786 5c55c40b

core/java/android/view/WindowManagerImpl.java

+8 −0
Original line number Diff line number Diff line
@@ -340,6 +340,14 @@ public class WindowManagerImpl implements WindowManager { 
            View curView = root.getView();

            

            root.mAddNesting = 0;



            if (view != null) {

                InputMethodManager imm = InputMethodManager.getInstance(view.getContext());

                if (imm != null) {

                    imm.windowDismissed(mViews[index].getWindowToken());

                }

            }



            root.die(true);

            finishRemoveViewLocked(curView, index);

            if (curView == view) {

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

+1 −0
Original line number Diff line number Diff line
@@ -672,6 +672,7 @@ public final class InputMethodManager { 
     * Disconnect any existing input connection, clearing the served view.

     */

    void finishInputLocked() {

        mCurRootView = null;

        mNextServedView = null;

        if (mServedView != null) {

            if (DEBUG) Log.v(TAG, "FINISH INPUT: " + mServedView);