summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/webkit/WebView.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index fb760ac708d8..f3f9a6d95ba6 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;