Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55767443 authored by Adam Powell's avatar Adam Powell
Browse files

Fix bug 3382994 - android.view.WindowManager$BadTokenException 

Remove pending callbacks when ActionMenuView is detached.

Change-Id: Ia61e446f60f10dd82476c00b4c11177182e7db60
parent da6f9295

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -53,7 +53,7 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo 
    

    

    private Drawable mDivider;

    private Drawable mDivider;





    private Runnable mShowOverflow = new Runnable() {

    private final Runnable mShowOverflow = new Runnable() {

        public void run() {

        public void run() {

            showOverflowMenu();

            showOverflowMenu();

        }

        }
@@ -128,6 +128,10 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo 
        if (mOverflowPopup != null && mOverflowPopup.isShowing()) {

        if (mOverflowPopup != null && mOverflowPopup.isShowing()) {

            mOverflowPopup.dismiss();

            mOverflowPopup.dismiss();

        }

        }

        removeCallbacks(mShowOverflow);

        if (mPostedOpenRunnable != null) {

            removeCallbacks(mPostedOpenRunnable);

        }

    }

    }





    private int getMaxActionButtons() {

    private int getMaxActionButtons() {