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

Merge "Guarding against null pointer exception when setting view structure info for content capture" into sc-dev

Browse Source
This commit is contained in:
Mihir Patel
2021-07-02 18:22:15 +00:00
committed by Android (Google) Code Review
parent 9b2ed0b134 987a2b4150
commit 59fe064d75
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
core/java/android/widget/TextView.java
View File

@@ -11854,23 +11854,28 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
// Get the text and trim it to the range we are reporting. // Get the text and trim it to the range we are reporting.
CharSequence text = getText(); CharSequence text = getText();
if (expandedTopChar > 0 || expandedBottomChar < text.length()) {
text = text.subSequence(expandedTopChar, expandedBottomChar);
}
if (viewFor == VIEW_STRUCTURE_FOR_AUTOFILL) { if (text != null) {
structure.setText(text); if (expandedTopChar > 0 || expandedBottomChar < text.length()) {
} else { text = text.subSequence(expandedTopChar, expandedBottomChar);
structure.setText(text, selStart - expandedTopChar, selEnd - expandedTopChar); }
final int[] lineOffsets = new int[bottomLine - topLine + 1]; if (viewFor == VIEW_STRUCTURE_FOR_AUTOFILL) {
final int[] lineBaselines = new int[bottomLine - topLine + 1]; structure.setText(text);
final int baselineOffset = getBaselineOffset(); } else {
for (int i = topLine; i <= bottomLine; i++) { structure.setText(text,
lineOffsets[i - topLine] = layout.getLineStart(i); selStart - expandedTopChar,
lineBaselines[i - topLine] = layout.getLineBaseline(i) + baselineOffset; selEnd - expandedTopChar);
final int[] lineOffsets = new int[bottomLine - topLine + 1];
final int[] lineBaselines = new int[bottomLine - topLine + 1];
final int baselineOffset = getBaselineOffset();
for (int i = topLine; i <= bottomLine; i++) {
lineOffsets[i - topLine] = layout.getLineStart(i);
lineBaselines[i - topLine] = layout.getLineBaseline(i) + baselineOffset;
}
structure.setTextLines(lineOffsets, lineBaselines);
} }
structure.setTextLines(lineOffsets, lineBaselines);
} }
} }