commit cb4541fc8e1dd6165d65b16cd7c8b2b9fb763c80
author Brian Muramatsu <btmura@google.com> Fri Nov 19 16:52:11 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 19 16:52:11 2010 -0800
tree ac319d4f85f5a498d4dbc7f92f18daecfca6fdf3
parent 04d070f2937ae4dd72d9d87407b9abf7f664660e
parent 3f6b3b6430f3fad595e46c63876ee8c96e22e127

Merge "Fix ClipboardManager#hasText"

core/java/android/content/ClipboardManager.java

diff --git a/core/java/android/content/ClipboardManager.java b/core/java/android/content/ClipboardManager.java
index 85a6765..3e2b763 100644
--- a/core/java/android/content/ClipboardManager.java
+++ b/core/java/android/content/ClipboardManager.java
@@ -189,7 +189,7 @@
      */
     public boolean hasText() {
         try {
-            return getService().hasPrimaryClip();
+            return getService().hasClipboardText();
         } catch (RemoteException e) {
             return false;
         }