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

Commit 74193671 authored by Mihir Patel's avatar Mihir Patel Committed by Automerger Merge Worker
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 am: 59fe064d am: 2e8b06aa

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15067633

Change-Id: I41642583099cfc4dd252e8b411755247998f6b98
parents cc71de96 2e8b06aa

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) {