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

Commit 900185d0 authored by James Cook's avatar James Cook
Browse files

Handle undo in TextView fields with no cursor 

This fixes a rare crash in the undo system. In particular, if the
TextView did not have a cursor and the first operation was a
programmatic insert/append the "old cursor position" would be -1.
Attempting to undo would try to restore the cursor to -1 and crash.

Test will land separately in CTS.

Bug: 19332904
Change-Id: I9aa18c1e3621b99d13ac707e483154382effb81c
parent ba4df962

core/java/android/widget/Editor.java

+3 −2
Original line number Diff line number Diff line
@@ -4887,9 +4887,10 @@ public class Editor { 
                    text.insert(newTextInsertAt, newText);

                }

            }

            // Restore the cursor position.

            // Restore the cursor position. If there wasn't an old cursor (newCursorPos == -1) then

            // don't explicitly set it and rely on SpannableStringBuilder to position it.

            // TODO: Select all the text that was undone.

            if (newCursorPos <= text.length()) {

            if (0 <= newCursorPos && newCursorPos <= text.length()) {

                Selection.setSelection(text, newCursorPos);

            }

        }