From b0db5940c9c444d79f0bcae6526f390a99c01037 Mon Sep 17 00:00:00 2001 From: Gilles Debunne Date: Tue, 4 Jan 2011 13:58:54 -0800 Subject: Fix for an NPE in Account settings on long press. Bug 3333512 Change-Id: Ief79e824b86b964598f00ef74c6b5c61c0730242 --- core/java/android/widget/TextView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/java/android/widget/TextView.java') diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index af3ffe5afbb3..cc5be00d19e5 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -7854,7 +7854,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener MenuHandler handler = new MenuHandler(); - if (mText instanceof Spanned) { + if (mText instanceof Spanned && hasSelectionController()) { long lastTouchOffset = getLastTouchOffsets(); final int selStart = extractRangeStartFromLong(lastTouchOffset); final int selEnd = extractRangeEndFromLong(lastTouchOffset); -- cgit v1.2.3