diff options
| author | Leon Scroggins <scroggo@google.com> | 2010-11-11 11:41:07 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-11 11:41:07 -0800 |
| commit | 8b83d25222a59a958b702cac03292332befeef50 (patch) | |
| tree | a3c765a94bcc73f0c8d75d26a7141af96fd6d52a /core/java | |
| parent | 54019ee8c582bc0871d4d3395d690dfd35a8e08b (diff) | |
| parent | ef7af2897530f556e2353a35a00da2fcd1666639 (diff) | |
| download | frameworks_base-8b83d25222a59a958b702cac03292332befeef50.zip frameworks_base-8b83d25222a59a958b702cac03292332befeef50.tar.gz frameworks_base-8b83d25222a59a958b702cac03292332befeef50.tar.bz2 | |
Merge "Ensure that text passed in is non-null."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 7 |
1 files changed, 5 insertions, 2 deletions
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; |