diff options
| author | Gilles Debunne <debunne@google.com> | 2010-11-04 10:13:00 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-04 10:13:00 -0700 |
| commit | 4e331a784d377b79a23065e0fa06e41dc1998ec0 (patch) | |
| tree | d70218b07bba284a89fba41e7ea8f0b478935fe3 /core/java | |
| parent | 5300f278fc67a6473480d88cb45480e8f6de2ffd (diff) | |
| parent | e1c14e6a9444b1a90aefec801a3aaf4e8bb43543 (diff) | |
Merge "Tapping on paste popup with an empty clipboard does not crash in TextView."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 81c2f658bbc5..fc304467cacd 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -8042,9 +8042,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener @Override public void onClick(View v) { - ClipboardManager clipboard = - (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE); - paste(clipboard, getSelectionStart(), getSelectionEnd()); + if (canPaste()) { + ClipboardManager clipboard = + (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE); + paste(clipboard, getSelectionStart(), getSelectionEnd()); + } + hide(); } void positionAtCursor() { |