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

Commit 1f81973e authored Jan 28, 2015 by Jose Lima Committed by Android (Google) Code Review Jan 28, 2015

Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev

parents cefcd81b bd769a15

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);
		}