am a4f8e903: am 5fc3c84f: Merge "Fix bug 3362680 - calendar crash while tabbing among views" into honeycomb

* commit 'a4f8e903c3b4be9a840e0495be5bbfdb2a0a21e1':
  Fix bug 3362680 - calendar crash while tabbing among views

1 files changed, 11 insertions, 1 deletions

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 46251bc..2576af9 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -5158,7 +5158,16 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
           removeCallbacks(mPendingCheckForLongPress);
         }
     }
-    
+
+    /**
+     * Remove the pending click action
+     */
+    private void removePerformClickCallback() {
+        if (mPerformClick != null) {
+            removeCallbacks(mPerformClick);
+        }
+    }
+
     /**
      * Remove the prepress detection timer.
      */
@@ -7620,6 +7629,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
 
         removeUnsetPressCallback();
         removeLongPressCallback();
+        removePerformClickCallback();
 
         destroyDrawingCache();