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

2011-01-21 15:49:46 -08:00
parent c4cc3ea48a 3cb8b638c4
commit 5fc3c84f5c
1 changed files with 11 additions and 1 deletions
--- 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();