From 44d2c69ad30878521c6eff66a83893099b3d12ee Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@android.com>
Date: Tue, 19 Oct 2010 12:19:41 -0700
Subject: Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX

Bug: 3110967
Change-Id: I156070956528c8c7d1eb6db5d2e8bb1fe119178d
---
 core/java/android/webkit/WebTextView.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'core/java/android/webkit/WebTextView.java')

diff --git a/core/java/android/webkit/WebTextView.java b/core/java/android/webkit/WebTextView.java
index f7afdb96691c..4f192b3a8508 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;
@@ -292,8 +293,9 @@ import java.util.ArrayList;
      * 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);
-- 
cgit v1.2.3