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

Commit f309c7a8 authored by Gilles Debunne's avatar Gilles Debunne Committed by Android Git Automerger
Browse files

am 1b400c77: Merge "Fix for NPE in TextView." into gingerbread 

Merge commit '1b400c77' into gingerbread-plus-aosp

* commit '1b400c77':
  Fix for NPE in TextView.
parents fe8eaf3b 1b400c77

core/java/android/widget/TextView.java

+5 −0
Original line number Diff line number Diff line
@@ -7122,6 +7122,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();
@@ -7145,6 +7146,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
    }

    

    private String getWordForDictionary() {

        if (mSelectionModifierCursorController == null) {

            return null;

        }



        int offset = ((SelectionModifierCursorController) mSelectionModifierCursorController).

                     getMinTouchOffset();