From e1c14e6a9444b1a90aefec801a3aaf4e8bb43543 Mon Sep 17 00:00:00 2001
From: Gilles Debunne <debunne@google.com>
Date: Wed, 3 Nov 2010 19:24:29 -0700
Subject: Tapping on paste popup with an empty clipboard does not crash in
 TextView.

Change-Id: I5730ec46582862c6233a9e3a2d4bf695cd2c3e69
---
 core/java/android/widget/TextView.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'core/java/android/widget/TextView.java')

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() {
-- 
cgit v1.2.3