diff options
| author | Leon Scroggins <scroggo@google.com> | 2010-05-25 11:13:47 -0400 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2010-05-25 11:33:03 -0400 |
| commit | eb51f3e340d3ddc935367c302167d4b4b706e904 (patch) | |
| tree | 26d6929afd342576524dc264f65908f0e526d155 /core/java | |
| parent | dcea182c9a8eaa0895a3b675a695791df06d9d5e (diff) | |
| download | frameworks_base-eb51f3e340d3ddc935367c302167d4b4b706e904.zip frameworks_base-eb51f3e340d3ddc935367c302167d4b4b706e904.tar.gz frameworks_base-eb51f3e340d3ddc935367c302167d4b4b706e904.tar.bz2 | |
Check for null before using Layout.
Bug 2713024
Change-Id: Iaad5c774fa1e16c341d481104f8fd38f7add3082
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/webkit/WebTextView.java | 8 |
1 files changed, 5 insertions, 3 deletions
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); |