Merge "Fix bug 3362680 - calendar crash while tabbing among views" into honeycomb

1 files changed, 11 insertions, 1 deletions

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 811a633920de..b41687e4dabe 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -5117,7 +5117,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.
      */
@@ -7579,6 +7588,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
 
         removeUnsetPressCallback();
         removeLongPressCallback();
+        removePerformClickCallback();
 
         destroyDrawingCache();