Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59fe064d authored by Mihir Patel's avatar Mihir Patel Committed by Android (Google) Code Review
Browse files

Merge "Guarding against null pointer exception when setting view structure... 

Merge "Guarding against null pointer exception when setting view structure info for content capture" into sc-dev
parents 9b2ed0b1 987a2b41

core/java/android/widget/TextView.java

+20 −15
Original line number Diff line number Diff line
@@ -11854,6 +11854,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 














                // Get the text and trim it to the range we are reporting.















                CharSequence text = getText();

























                if (text != null) {















                    if (expandedTopChar > 0 || expandedBottomChar < text.length()) {















                        text = text.subSequence(expandedTopChar, expandedBottomChar);















                    }









@@ -11861,7 +11863,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener













                    if (viewFor == VIEW_STRUCTURE_FOR_AUTOFILL) {















                        structure.setText(text);















                    } else {













                    structure.setText(text, selStart - expandedTopChar, selEnd - expandedTopChar);













                        structure.setText(text,













                                selStart - expandedTopChar,













                                selEnd - expandedTopChar);





























                        final int[] lineOffsets = new int[bottomLine - topLine + 1];















                        final int[] lineBaselines = new int[bottomLine - topLine + 1];









@@ -11873,6 +11877,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener













                        structure.setTextLines(lineOffsets, lineBaselines);















                    }















                }













            }





























            if (viewFor == VIEW_STRUCTURE_FOR_ASSIST















                    || viewFor == VIEW_STRUCTURE_FOR_CONTENT_CAPTURE) {