commit 89d90299b0c31277d4fe61f644c09cfab4ae44ee
author Adam Powell <adamp@google.com> Mon Jan 24 14:37:46 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 24 14:37:46 2011 -0800
tree 35cbd9644cf9eb551894e9383e0f0d54a6ca212d
parent 81ac92df33ba146a51fbbf3d5108379a9eb346b1
parent c831e3192ccd9b2cf69ec7c973005e578631da3b

am c831e319: Merge "Fix bug 3382994 - android.view.WindowManager" into honeycomb

* commit 'c831e3192ccd9b2cf69ec7c973005e578631da3b':
  Fix bug 3382994 - android.view.WindowManager$BadTokenException

core/java/com/android/internal/view/menu/ActionMenuView.java

diff --git a/core/java/com/android/internal/view/menu/ActionMenuView.java b/core/java/com/android/internal/view/menu/ActionMenuView.java
index 30d6878..ff15e44 100644
--- a/core/java/com/android/internal/view/menu/ActionMenuView.java
+++ b/core/java/com/android/internal/view/menu/ActionMenuView.java
@@ -53,7 +53,7 @@
     
     private Drawable mDivider;
 
-    private Runnable mShowOverflow = new Runnable() {
+    private final Runnable mShowOverflow = new Runnable() {
         public void run() {
             showOverflowMenu();
         }
@@ -128,6 +128,10 @@
         if (mOverflowPopup != null && mOverflowPopup.isShowing()) {
             mOverflowPopup.dismiss();
         }
+        removeCallbacks(mShowOverflow);
+        if (mPostedOpenRunnable != null) {
+            removeCallbacks(mPostedOpenRunnable);
+        }
     }
 
     private int getMaxActionButtons() {