am 58f750ad: Merge "Fix for an NPE in Account settings on long press." into honeycomb

* commit '58f750ad145e6920c1c75bed8b333e54d78f3fed':
  Fix for an NPE in Account settings on long press.
This commit is contained in:
Gilles Debunne
2011-01-10 10:15:48 -08:00
committed by Android Git Automerger
2 changed files with 2 additions and 2 deletions

View File

@@ -259436,7 +259436,7 @@
deprecated="not deprecated"
visibility="public"
>
<parameter name="arg0" type="T">
<parameter name="t" type="T">
</parameter>
</method>
</interface>

View File

@@ -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);