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

Prevent exception when surrounding text retrieval

Browse Source 
We use same reference from TextView to set the initial
surrounding text. The actual surrounding text may be
modified before retrieval since the mSurroundingText
is mutable. Use a copy of subText should avoid this
concurrent issue.

Bug: 160390184
Test: atest FrameworksCoreTests:EditorInfoTest
Change-Id: I6082a4cae2fcdc4c529dc14e2e5e7a45ab1aae4d
(cherry picked from commit 0ebe70cb0f)
This commit is contained in:
Wilson Wu
2020-07-17 23:50:45 +08:00
committed by android-build-team Robot
parent fa5cc51c8d
commit bb2eb8cc32
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/view/inputmethod/EditorInfo.java
View File

@@ -27,6 +27,7 @@ import android.os.LocaleList;
import android.os.Parcel;
import android.os.Parcelable;
import android.os.UserHandle;
import android.text.Editable;
import android.text.InputType;
import android.text.TextUtils;
import android.util.Printer;
@@ -567,7 +568,8 @@ public class EditorInfo implements InputType, Parcelable {
* editor wants to trim out the first 10 chars, subTextStart should be 10.
*/
public void setInitialSurroundingSubText(@NonNull CharSequence subText, int subTextStart) {
Objects.requireNonNull(subText);
CharSequence newSubText = Editable.Factory.getInstance().newEditable(subText);
Objects.requireNonNull(newSubText);
// Swap selection start and end if necessary.
final int subTextSelStart = initialSelStart > initialSelEnd
@@ -575,7 +577,7 @@ public class EditorInfo implements InputType, Parcelable {
final int subTextSelEnd = initialSelStart > initialSelEnd
? initialSelStart - subTextStart : initialSelEnd - subTextStart;
final int subTextLength = subText.length();
final int subTextLength = newSubText.length();
// Unknown or invalid selection.
if (subTextStart < 0 || subTextSelStart < 0 || subTextSelEnd > subTextLength) {
mInitialSurroundingText = new InitialSurroundingText();
@@ -589,12 +591,12 @@ public class EditorInfo implements InputType, Parcelable {
}
if (subTextLength <= MEMORY_EFFICIENT_TEXT_LENGTH) {
mInitialSurroundingText = new InitialSurroundingText(subText, subTextSelStart,
mInitialSurroundingText = new InitialSurroundingText(newSubText, subTextSelStart,
subTextSelEnd);
return;
}
trimLongSurroundingText(subText, subTextSelStart, subTextSelEnd);
trimLongSurroundingText(newSubText, subTextSelStart, subTextSelEnd);
}
/**

19
core/tests/coretests/src/android/view/inputmethod/EditorInfoTest.java
View File

@@ -264,6 +264,25 @@ public class EditorInfoTest {
InputConnection.GET_TEXT_WITH_STYLES)));
}
@Test
public void surroundingTextRetrieval_writeToParcel_noException() {
StringBuilder sb = new StringBuilder("abcdefg");
Parcel parcel = Parcel.obtain();
EditorInfo editorInfo = new EditorInfo();
editorInfo.initialSelStart = 2;
editorInfo.initialSelEnd = 5;
editorInfo.inputType = EditorInfo.TYPE_CLASS_TEXT;
editorInfo.setInitialSurroundingText(sb);
sb.setLength(0);
editorInfo.writeToParcel(parcel, 0);
try {
editorInfo.getInitialTextBeforeCursor(60, 1);
fail("Test shouldn't have exception");
} catch (AssertionError e) { }
}
private static void assertExpectedTextLength(EditorInfo editorInfo,
@Nullable Integer expectBeforeCursorLength, @Nullable Integer expectSelectionLength,
@Nullable Integer expectAfterCursorLength) {