am 733329a2: Merge "Fix NPE when pasting non-text from Clipboard"

* commit '733329a2745ce703029b40afaa5dd78c7a5b620c':
  Fix NPE when pasting non-text from Clipboard
This commit is contained in:
John Reck
2013-03-12 14:29:48 -07:00
committed by Android Git Automerger

View File

@@ -5416,7 +5416,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
ClipData clipData = cm.getPrimaryClip();
if (clipData != null) {
ClipData.Item clipItem = clipData.getItemAt(0);
CharSequence pasteText = clipItem.getText();
CharSequence pasteText = clipItem.coerceToText(mContext);
if (mInputConnection != null) {
mInputConnection.replaceSelection(pasteText);
}