am f3be3ddf: Merge "Fix: Selection handles can remain on home screen." into mnc-dev

* commit 'f3be3ddfd86c362f21948b8253bf8a88a710ed82': Fix: Selection handles can remain on home screen.
2015-07-02 00:39:03 +00:00
parent 71b972140d f3be3ddfd8
commit 6ebe0bdce2
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -1186,7 +1186,7 @@ public class Editor {
            final InputMethodManager imm = InputMethodManager.peekInstance();
            final boolean immFullScreen = (imm != null && imm.isFullscreenMode());
            if (mSelectionModifierCursorController != null && mTextView.hasSelection()
-                    && !immFullScreen) {
+                    && !immFullScreen && mTextActionMode != null) {
                mSelectionModifierCursorController.show();
            }
        } else {