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

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

Bug 5312828 - Menu button not responding 

Increase tolerance for apps calling invalidateOptionsMenu at
inconvenient times.

Change-Id: I712b20002afd0f056c3f05b160c5fa9c2ef0b552
parent a6708c6a

policy/src/com/android/internal/policy/impl/PhoneWindow.java

+16 −6
Original line number Original line Diff line number Diff line
@@ -349,8 +349,9 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
        }

        }





        // Already prepared (isPrepared will be reset to false later)

        // Already prepared (isPrepared will be reset to false later)

        if (st.isPrepared)

        if (st.isPrepared) {

            return true;

            return true;

        }

        

        

        if ((mPreparedPanel != null) && (mPreparedPanel != st)) {

        if ((mPreparedPanel != null) && (mPreparedPanel != st)) {

            // Another Panel is prepared and possibly open, so close it

            // Another Panel is prepared and possibly open, so close it
@@ -800,7 +801,15 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
                    closePanel(st, true);

                    closePanel(st, true);





                } else if (st.isPrepared) {

                } else if (st.isPrepared) {

                    boolean show = true;

                    if (st.refreshMenuContent) {

                        // Something may have invalidated the menu since we prepared it.

                        // Re-prepare it to refresh.

                        st.isPrepared = false;

                        show = preparePanel(st, event);

                    }





                    if (show) {

                        // Write 'menu opened' to event log

                        // Write 'menu opened' to event log

                        EventLog.writeEvent(50001, 0);

                        EventLog.writeEvent(50001, 0);
@@ -810,6 +819,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
                        playSoundEffect = true;

                        playSoundEffect = true;

                    }

                    }

                }

                }

            }





            if (playSoundEffect) {

            if (playSoundEffect) {

                AudioManager audioManager = (AudioManager) getContext().getSystemService(

                AudioManager audioManager = (AudioManager) getContext().getSystemService(