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

Merge "Bug 5166707: NPE fixed in getFocusedRect"

Browse Source
This commit is contained in:
Gilles Debunne
2011-08-25 13:45:11 -07:00
committed by Android (Google) Code Review
parent 463854bead fd419b051a
commit 8e7e95f22f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4788,8 +4788,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
selEnd = getSelectionEnd(); selEnd = getSelectionEnd();
if (selStart >= 0) { if (selStart >= 0) {
if (mHighlightPath == null) if (mHighlightPath == null) mHighlightPath = new Path();
mHighlightPath = new Path();
if (selStart == selEnd) { if (selStart == selEnd) {
if (isCursorVisible() && if (isCursorVisible() &&
@@ -4995,6 +4994,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
} else { } else {
// Selection extends across multiple lines -- the focused // Selection extends across multiple lines -- the focused
// rect covers the entire width. // rect covers the entire width.
if (mHighlightPath == null) mHighlightPath = new Path();
if (mHighlightPathBogus) { if (mHighlightPathBogus) {
mHighlightPath.reset(); mHighlightPath.reset();
mLayout.getSelectionPath(selStart, selEnd, mHighlightPath); mLayout.getSelectionPath(selStart, selEnd, mHighlightPath);