commit 8e7e95f22f700fae6926d87b25c388bf9b509389
author Gilles Debunne <debunne@google.com> Thu Aug 25 13:45:11 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 25 13:45:11 2011 -0700
tree 2c2d286f84084bd1e0eec1004a8903ca98d8110c
parent 463854bead24c951932d1d8c31e4f22cbce983fb
parent fd419b051a43c68b28131d1fd4535af0d21b5039

Merge "Bug 5166707: NPE fixed in getFocusedRect"

core/java/android/widget/TextView.java

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 2b94417..c92b5f9 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -4788,8 +4788,7 @@
             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 @@
             } 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);