commit 6cedefa2e4a10724982a72e22abc349c7578902d
author Clara Bayarri <clarabayarri@google.com> Tue Mar 31 16:42:31 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 31 16:42:33 2015 +0000
tree b7a21fc6636f3e3edda9328319c60ad40144f631
parent 63473869da8ea7f39a2b530dd6e026bedc5e6f07
parent 7fc946eb5d232fad17213582b6fdab24e6b9a8fa

Merge "Editor: Fix crash when selecting text on a non-editable TextView"

core/java/android/widget/Editor.java

diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index 82e36c3..32b99a8 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -2954,8 +2954,11 @@
             }
             mSelectionHandleHeight = Math.max(
                     mSelectHandleLeft.getMinimumHeight(), mSelectHandleRight.getMinimumHeight());
-            getInsertionController().getHandle();
-            mInsertionHandleHeight = mSelectHandleCenter.getMinimumHeight();
+            InsertionPointCursorController insertionController = getInsertionController();
+            if (insertionController != null) {
+                insertionController.getHandle();
+                mInsertionHandleHeight = mSelectHandleCenter.getMinimumHeight();
+            }
         }
 
         @Override