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 
am: 1ffdec20b4

Change-Id: Idbc82d56568d65542d189c84954c3c3f7cd7aea9
This commit is contained in:
Mihai Popa
2018-05-25 09:12:52 -07:00
committed by android-build-merger
parent 5116500c9d 1ffdec20b4
commit 3b88884d91
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 =