commit 7fc946eb5d232fad17213582b6fdab24e6b9a8fa
author Clara Bayarri <clarabayarri@google.com> Tue Mar 31 14:48:33 2015 +0100
committer Clara Bayarri <clarabayarri@google.com> Tue Mar 31 15:13:06 2015 +0100
tree 6499fa04a0a591628f3ded9dbacdbd52a7fbee8a
parent 3af4330c5371f20ac5a378e6abe6bf1c356b0a06

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

We are querying the insertion controller, which is null on a
non-editable TextView.

Change-Id: Ie8428c6264385a1283310823c959ecdd63ef5a3f

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