Fix bug 3382994 - android.view.WindowManager$BadTokenException

Remove pending callbacks when ActionMenuView is detached.

Change-Id: Ia61e446f60f10dd82476c00b4c11177182e7db60

1 files changed, 5 insertions, 1 deletions

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 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo
     
     private Drawable mDivider;
 
-    private Runnable mShowOverflow = new Runnable() {
+    private final Runnable mShowOverflow = new Runnable() {
         public void run() {
             showOverflowMenu();
         }
@@ -128,6 +128,10 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo
         if (mOverflowPopup != null && mOverflowPopup.isShowing()) {
             mOverflowPopup.dismiss();
         }
+        removeCallbacks(mShowOverflow);
+        if (mPostedOpenRunnable != null) {
+            removeCallbacks(mPostedOpenRunnable);
+        }
     }
 
     private int getMaxActionButtons() {