drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix for an NPE in Account settings on long press." into honeycomb

Browse Source
This commit is contained in:
Gilles Debunne
2011-01-10 10:12:59 -08:00
committed by Android (Google) Code Review
parent be0ae5ea13 b0db5940c9
commit 58f750ad14
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.xml
View File

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

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

@ -7854,7 +7854,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
MenuHandler handler = new MenuHandler(); MenuHandler handler = new MenuHandler();
if (mText instanceof Spanned) { if (mText instanceof Spanned && hasSelectionController()) {
long lastTouchOffset = getLastTouchOffsets(); long lastTouchOffset = getLastTouchOffsets();
final int selStart = extractRangeStartFromLong(lastTouchOffset); final int selStart = extractRangeStartFromLong(lastTouchOffset);
final int selEnd = extractRangeEndFromLong(lastTouchOffset); final int selEnd = extractRangeEndFromLong(lastTouchOffset);