Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix monkey crash in smart selection animation" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-25 15:59:07 +00:00
committed by Android (Google) Code Review
parent 568ccfe0b6 6e8e27bf9a
commit 1ffdec20b4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/widget/SelectionActionModeHelper.java
View File

@@ -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 =