summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-01-21 15:56:08 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-21 15:56:08 -0800
commit61d4504ec66827924f926e99361ebf432c2390cb (patch)
tree419c403f71bb541f8a08d6429c20f1c04f6a36b7 /core
parent405a32ac23e12f4a04de71a745a1e88c57e09caa (diff)
parenta4f8e903c3b4be9a840e0495be5bbfdb2a0a21e1 (diff)
downloadframeworks_base-61d4504ec66827924f926e99361ebf432c2390cb.zip
frameworks_base-61d4504ec66827924f926e99361ebf432c2390cb.tar.gz
frameworks_base-61d4504ec66827924f926e99361ebf432c2390cb.tar.bz2
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
Diffstat (limited to 'core')
-rw-r--r--core/java/android/view/View.java12
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();