diff options
| author | Nils Holmström <nils.holmstrom@sonymobile.com> | 2013-01-08 15:42:01 +0100 |
|---|---|---|
| committer | Takeshi Aimi <takeshi.aimi@sonymobile.com> | 2013-03-12 20:49:14 +0900 |
| commit | df337f30e938e3f3470eb6c154c3ee7e69bd4354 (patch) | |
| tree | d861f153ede849b6e8774d666680990a0b77691f /core/java | |
| parent | c9e0cd2ac7b1df3e60f0ca8bab6a7240bade07d9 (diff) | |
Fix NPE when pasting non-text from Clipboard
When copying a link from a bookmark and then pasting it into
a textfield a NullPointerException will occur.
A ClipData.Item is not guaranteed to always contain a text string
and therefore getText() can be set to null.
Using method coerceToText() instead of getText() makes sure that
a text string is always returned.
Change-Id: I81343c0371835a3a7a52045dcd1760e69e59a967
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/webkit/WebViewClassic.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index 0024fd34a994..4db9f6c27342 100644 --- 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); } |
