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

Commit bd769a15 authored by Jose Lima's avatar Jose Lima
Browse files

Fix crash caused by disabling the Options panel on TVs 

   Address more cases where calls to getPanelState may cause a crash when the
options panel is disabled on a platform.

Bug: 19178531
Bug: 18780696
Change-Id: Ib72bb8483e636181788ed3919c4cb9e99a94b7b1
parent 1061652a

core/java/android/app/Activity.java

+3 −1
Original line number Diff line number Diff line
@@ -3230,8 +3230,10 @@ public class Activity extends ContextThemeWrapper 
     * Programmatically closes the most recently opened context menu, if showing.

     */

    public void closeContextMenu() {

        if (mWindow.hasFeature(Window.FEATURE_CONTEXT_MENU)) {

            mWindow.closePanel(Window.FEATURE_CONTEXT_MENU);

        }

    }



    /**

     * This hook is called whenever an item in a context menu is selected. The

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

+1 −1
Original line number Diff line number Diff line
@@ -3165,7 +3165,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 


            // If the user is chording a menu shortcut, release the chord since

            // this window lost focus

            if (!hasWindowFocus && mPanelChordingKey != 0) {

            if (hasFeature(FEATURE_OPTIONS_PANEL) && !hasWindowFocus && mPanelChordingKey != 0) {

                closePanel(FEATURE_OPTIONS_PANEL);

            }