From ef7af2897530f556e2353a35a00da2fcd1666639 Mon Sep 17 00:00:00 2001
From: Leon Scroggins <scroggo@google.com>
Date: Thu, 11 Nov 2010 14:20:06 -0500
Subject: Ensure that text passed in is non-null.

Bug:3183112
Change-Id: Icf00e2793cb9b62dd0ebb4f60b8ddcafea3e581f
---
 core/java/android/webkit/WebView.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'core')

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index fb760ac..f3f9a6d 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -6529,8 +6529,11 @@ public class WebView extends AbsoluteLayout
                         // If the text entry has created more events, ignore
                         // this one.
                         } else if (msg.arg2 == mTextGeneration) {
-                            mWebTextView.setTextAndKeepSelection(
-                                    (String) msg.obj);
+                            String text = (String) msg.obj;
+                            if (null == text) {
+                                text = "";
+                            }
+                            mWebTextView.setTextAndKeepSelection(text);
                         }
                     }
                     break;
-- 
cgit v1.1