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

Commit c75676f8 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 853f284c: am c9cb3083: Merge "Fix bug 3405899 - android.view.WindowManager" into honeycomb 

* commit '853f284c':
  Fix bug 3405899 - android.view.WindowManager$BadTokenException
parents 58468459 853f284c

core/java/android/widget/TextView.java

+8 −2
Original line number Diff line number Diff line
@@ -7388,14 +7388,20 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 


        if (!mInsertionControllerEnabled) {

            hideInsertionPointCursorController();

            if (mInsertionPointCursorController != null) {

                mInsertionPointCursorController.onDetached();

                mInsertionPointCursorController = null;

            }

        }



        if (!mSelectionControllerEnabled) {

            stopSelectionActionMode();

            if (mSelectionModifierCursorController != null) {

                mSelectionModifierCursorController.onDetached();

                mSelectionModifierCursorController = null;

            }

        }

    }



    /**

     * @return True iff this TextView contains a text that can be edited, or if this is