diff options
| author | Clara Bayarri <clarabayarri@google.com> | 2015-03-31 16:42:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-31 16:42:33 +0000 |
| commit | 6cedefa2e4a10724982a72e22abc349c7578902d (patch) | |
| tree | b7a21fc6636f3e3edda9328319c60ad40144f631 /core/java/android | |
| parent | 63473869da8ea7f39a2b530dd6e026bedc5e6f07 (diff) | |
| parent | 7fc946eb5d232fad17213582b6fdab24e6b9a8fa (diff) | |
| download | frameworks_base-6cedefa2e4a10724982a72e22abc349c7578902d.zip frameworks_base-6cedefa2e4a10724982a72e22abc349c7578902d.tar.gz frameworks_base-6cedefa2e4a10724982a72e22abc349c7578902d.tar.bz2 | |
Merge "Editor: Fix crash when selecting text on a non-editable TextView"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/widget/Editor.java | 7 |
1 files changed, 5 insertions, 2 deletions
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 @@ public class Editor { } mSelectionHandleHeight = Math.max( mSelectHandleLeft.getMinimumHeight(), mSelectHandleRight.getMinimumHeight()); - getInsertionController().getHandle(); - mInsertionHandleHeight = mSelectHandleCenter.getMinimumHeight(); + InsertionPointCursorController insertionController = getInsertionController(); + if (insertionController != null) { + insertionController.getHandle(); + mInsertionHandleHeight = mSelectHandleCenter.getMinimumHeight(); + } } @Override |