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

Commit 6c455c8f authored by Andreas Sandblad's avatar Andreas Sandblad Committed by Patrick Jacques
Browse files

Monkey Crash: NullPointerException in WebTextView

getLayout() may return null if text or width has recently changed.
This fixes http://code.google.com/p/android/issues/detail?id=8055

Change-Id: Ibdf1226b3fec55cf3b9349741c228b9953a61585
parent dc4b5a6e
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.text.Editable;
import android.text.InputFilter;
import android.text.Layout;
import android.text.Selection;
import android.text.Spannable;
import android.text.TextPaint;
@@ -482,8 +483,12 @@ import java.util.ArrayList;
            int smallerSlop = slop/2;
            if (dx > smallerSlop || dy > smallerSlop) {
                if (mWebView != null) {
                    float maxScrollX = (float) Touch.getMaxScrollX(this,
                                getLayout(), mScrollY);
                    final Layout layout = getLayout();
                    float maxScrollX = 0;
                    if (layout != null) {
                        maxScrollX = (float) Touch.getMaxScrollX(this,
                                layout, mScrollY);
                    }
                    if (DebugFlags.WEB_TEXT_VIEW) {
                        Log.v(LOGTAG, "onTouchEvent x=" + mScrollX + " y="
                                + mScrollY + " maxX=" + maxScrollX);