Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58f750ad authored by Gilles Debunne's avatar Gilles Debunne Committed by Android (Google) Code Review
Browse files

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

parents be0ae5ea b0db5940

api/current.xml

+1 −1
Original line number Diff line number Diff line
@@ -258003,7 +258003,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="arg0" type="T">

<parameter name="t" type="T">

</parameter>

</method>

</interface>

core/java/android/widget/TextView.java

+1 −1
Original line number Diff line number Diff line
@@ -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);