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

Commit 1ef41605 authored by Cary Clark's avatar Cary Clark Committed by Android Git Automerger
Browse files

am d64f4a98: DO NOT MERGE fix null check 

Merge commit 'd64f4a98' into gingerbread-plus-aosp

* commit 'd64f4a98':
  DO NOT MERGE fix null check
parents 96dc4559 d64f4a98

core/java/android/webkit/WebView.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -3338,7 +3338,8 @@ public class WebView extends AbsoluteLayout 
        setUpSelect();

        setUpSelect();

        if (mNativeClass != 0 && nativeWordSelection(x, y)) {

        if (mNativeClass != 0 && nativeWordSelection(x, y)) {

            nativeSetExtendSelection();

            nativeSetExtendSelection();

            getWebChromeClient().onSelectionStart(this);

            WebChromeClient client = getWebChromeClient();

            if (client != null) client.onSelectionStart(this);

            return true;

            return true;

        }

        }

        notifySelectDialogDismissed();

        notifySelectDialogDismissed();
@@ -4136,7 +4137,8 @@ public class WebView extends AbsoluteLayout 
     */

     */

    public void selectionDone() {

    public void selectionDone() {

        if (mSelectingText) {

        if (mSelectingText) {

            getWebChromeClient().onSelectionDone(this);

            WebChromeClient client = getWebChromeClient();

            if (client != null) client.onSelectionDone(this);

            invalidate(); // redraw without selection

            invalidate(); // redraw without selection

            notifySelectDialogDismissed();

            notifySelectDialogDismissed();

        }

        }