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

Commit 43181fb7 authored Jan 28, 2015 by Jose Lima Committed by android-build-merger Jan 28, 2015

am 4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs"...

am 4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev automerge: 1f81973e
automerge: 485f6a60

* commit '485f6a60':
  Fix crash caused by disabling the Options panel on TVs

parents e469fcdd 485f6a60

core/java/android/app/Activity.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3226,8 +3226,10 @@ public class Activity extends ContextThemeWrapper
	* Programmatically closes the most recently opened context menu, if showing.		* Programmatically closes the most recently opened context menu, if showing.
	*/		*/
	public void closeContextMenu() {		public void closeContextMenu() {
			if (mWindow.hasFeature(Window.FEATURE_CONTEXT_MENU)) {
	mWindow.closePanel(Window.FEATURE_CONTEXT_MENU);		mWindow.closePanel(Window.FEATURE_CONTEXT_MENU);
	}		}
			}

	/**		/**
	* This hook is called whenever an item in a context menu is selected. The		* 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	Original line	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		// If the user is chording a menu shortcut, release the chord since
	// this window lost focus		// this window lost focus
	if (!hasWindowFocus && mPanelChordingKey != 0) {		if (hasFeature(FEATURE_OPTIONS_PANEL) && !hasWindowFocus && mPanelChordingKey != 0) {
	closePanel(FEATURE_OPTIONS_PANEL);		closePanel(FEATURE_OPTIONS_PANEL);
	}		}