diff options
| author | Leon Scroggins <scroggo@google.com> | 2010-11-11 14:20:06 -0500 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2010-11-11 14:20:06 -0500 |
| commit | ef7af2897530f556e2353a35a00da2fcd1666639 (patch) | |
| tree | 3d832a6a06307c329f7b809e040e1f45ca7e7665 | |
| parent | 8e93e4f3a8922cacc04a126711291f83112e0bf7 (diff) | |
| download | frameworks_base-ef7af2897530f556e2353a35a00da2fcd1666639.zip frameworks_base-ef7af2897530f556e2353a35a00da2fcd1666639.tar.gz frameworks_base-ef7af2897530f556e2353a35a00da2fcd1666639.tar.bz2 | |
Ensure that text passed in is non-null.
Bug:3183112
Change-Id: Icf00e2793cb9b62dd0ebb4f60b8ddcafea3e581f
| -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; |