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

Commit 98bb0a7e authored by Mihai Popa's avatar Mihai Popa Committed by Android (Google) Code Review
Browse files

Merge "Fix monkey crash in smart selection animation"

parents 78e75c6e a9d27ea8

core/java/android/widget/SelectionActionModeHelper.java

+6 −2
Original line number Diff line number Diff line
@@ -285,10 +285,14 @@ public final class SelectionActionModeHelper { 
        final Layout layout = mTextView.getLayout();



        final Runnable onAnimationEndCallback = () -> {

            if (result.mStart >= 0 && result.mEnd <= getText(mTextView).length()

            final SelectionResult startSelectionResult;

            if (result != null && result.mStart >= 0 && result.mEnd <= getText(mTextView).length()

                    && result.mStart <= result.mEnd) {

                startSelectionActionMode(result);

                startSelectionResult = result;

            } else {

                startSelectionResult = null;

            }

            startSelectionActionMode(startSelectionResult);

        };

        // TODO do not trigger the animation if the change included only non-printable characters

        final boolean didSelectionChange =