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

Commit 8e7e95f2 authored by Gilles Debunne's avatar Gilles Debunne Committed by Android (Google) Code Review
Browse files

Merge "Bug 5166707: NPE fixed in getFocusedRect"

parents 463854be fd419b05

core/java/android/widget/TextView.java

+2 −2
Original line number Diff line number Diff line
@@ -4788,8 +4788,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
            selEnd = getSelectionEnd();



            if (selStart >= 0) {

                if (mHighlightPath == null)

                    mHighlightPath = new Path();

                if (mHighlightPath == null) mHighlightPath = new Path();



                if (selStart == selEnd) {

                    if (isCursorVisible() &&
@@ -4995,6 +4994,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
            } else {

                // Selection extends across multiple lines -- the focused

                // rect covers the entire width.

                if (mHighlightPath == null) mHighlightPath = new Path();

                if (mHighlightPathBogus) {

                    mHighlightPath.reset();

                    mLayout.getSelectionPath(selStart, selEnd, mHighlightPath);