commit 59993d9bc589089e6be55371c6536a42afe21a64
author Brad Fitzpatrick <bradfitz@android.com> Tue Oct 19 12:40:53 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 19 12:40:53 2010 -0700
tree d3343a45eb969c92917792b7309d369009ea295d
parent bdf1706ac680c0fe74765b8d6d34823b8ac05306
parent 44d2c69ad30878521c6eff66a83893099b3d12ee

Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread

core/java/android/webkit/WebTextView.java

diff --git a/core/java/android/webkit/WebTextView.java b/core/java/android/webkit/WebTextView.java
index f7afdb9..4f192b3 100644
--- a/core/java/android/webkit/WebTextView.java
+++ b/core/java/android/webkit/WebTextView.java
@@ -28,6 +28,7 @@
 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;
@@ -292,8 +293,9 @@
      * Ensure that the underlying textfield is lined up with the WebTextView.
      */
     private void lineUpScroll() {
-        if (mWebView != null) {
-            float maxScrollX = Touch.getMaxScrollX(this, getLayout(), mScrollY);
+        Layout layout = getLayout();
+        if (mWebView != null && layout != null) {
+            float maxScrollX = Touch.getMaxScrollX(this, layout, mScrollY);
             if (DebugFlags.WEB_TEXT_VIEW) {
                 Log.v(LOGTAG, "onTouchEvent x=" + mScrollX + " y="
                         + mScrollY + " maxX=" + maxScrollX);