From eb51f3e340d3ddc935367c302167d4b4b706e904 Mon Sep 17 00:00:00 2001 From: Leon Scroggins Date: Tue, 25 May 2010 11:13:47 -0400 Subject: Check for null before using Layout. Bug 2713024 Change-Id: Iaad5c774fa1e16c341d481104f8fd38f7add3082 --- core/java/android/webkit/WebTextView.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'core/java') diff --git a/core/java/android/webkit/WebTextView.java b/core/java/android/webkit/WebTextView.java index c809b5a..362b2b1 100644 --- a/core/java/android/webkit/WebTextView.java +++ b/core/java/android/webkit/WebTextView.java @@ -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; @@ -497,9 +498,10 @@ import java.util.ArrayList; // to big for the case of a small textfield. int smallerSlop = slop/2; if (dx > smallerSlop || dy > smallerSlop) { - if (mWebView != null) { - float maxScrollX = (float) Touch.getMaxScrollX(this, - getLayout(), mScrollY); + Layout layout = getLayout(); + if (mWebView != null && layout != null) { + float maxScrollX = (float) Touch.getMaxScrollX(this, layout, + mScrollY); if (DebugFlags.WEB_TEXT_VIEW) { Log.v(LOGTAG, "onTouchEvent x=" + mScrollX + " y=" + mScrollY + " maxX=" + maxScrollX); -- cgit v1.1