diff options
| author | Mihai Popa <popam@google.com> | 2018-05-25 13:49:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-25 13:49:22 +0000 |
| commit | 98bb0a7ed4e08830af4f40078e86d338b0ea0769 (patch) | |
| tree | 1d36c6a9b73bdb57124b005cb489a3767c49e26d /core/java | |
| parent | 78e75c6ee05a121b12a13f4375a8e55e420fab70 (diff) | |
| parent | a9d27ea8692dbf6c6def6bd21754af0ad67d1675 (diff) | |
Merge "Fix monkey crash in smart selection animation"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/widget/SelectionActionModeHelper.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/widget/SelectionActionModeHelper.java b/core/java/android/widget/SelectionActionModeHelper.java index d22b1e66b596..6cb0eaa7f47d 100644 --- a/core/java/android/widget/SelectionActionModeHelper.java +++ b/core/java/android/widget/SelectionActionModeHelper.java @@ -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 = |