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

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

Merge "Fix for NPE in TextView." into gingerbread

parents 1c045003 df4ee430

core/java/android/widget/TextView.java

+5 −0
Original line number Diff line number Diff line
@@ -7117,6 +7117,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 


        int selectionStart, selectionEnd;



        // selectionModifierCursorController is not null at that point

        SelectionModifierCursorController selectionModifierCursorController =

            ((SelectionModifierCursorController) mSelectionModifierCursorController);

        int minOffset = selectionModifierCursorController.getMinTouchOffset();
@@ -7140,6 +7141,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
    }

    

    private String getWordForDictionary() {

        if (mSelectionModifierCursorController == null) {

            return null;

        }



        int offset = ((SelectionModifierCursorController) mSelectionModifierCursorController).

                     getMinTouchOffset();