Merge "Fix NPE when pasting non-text from Clipboard"

2013-03-12 20:24:13 +00:00
parent 7ad514094c df337f30e9
commit 733329a274
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -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);
            }