Merge "Tapping on paste popup with an empty clipboard does not crash in TextView."

2010-11-04 10:13:00 -07:00
parent 5300f278fc e1c14e6a94
commit 4e331a784d
1 changed files with 6 additions and 3 deletions
--- 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() {