am b7de79d0: am 41bb82be: Merge "Fix NullpointException problem in onMenuItemSelected" (262b311c) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2539,12 +2539,16 @@ public class Activity extends ContextThemeWrapper
	* Activity don't need to deal with feature codes.		* Activity don't need to deal with feature codes.
	*/		*/
	public boolean onMenuItemSelected(int featureId, MenuItem item) {		public boolean onMenuItemSelected(int featureId, MenuItem item) {
			CharSequence titleCondensed = item.getTitleCondensed();

	switch (featureId) {		switch (featureId) {
	case Window.FEATURE_OPTIONS_PANEL:		case Window.FEATURE_OPTIONS_PANEL:
	// Put event logging here so it gets called even if subclass		// Put event logging here so it gets called even if subclass
	// doesn't call through to superclass's implmeentation of each		// doesn't call through to superclass's implmeentation of each
	// of these methods below		// of these methods below
	EventLog.writeEvent(50000, 0, item.getTitleCondensed().toString());		if(titleCondensed != null) {
			EventLog.writeEvent(50000, 0, titleCondensed.toString());
			}
	if (onOptionsItemSelected(item)) {		if (onOptionsItemSelected(item)) {
	return true;		return true;
	}		}
	@@ -2562,7 +2566,9 @@ public class Activity extends ContextThemeWrapper
	return false;		return false;

	case Window.FEATURE_CONTEXT_MENU:		case Window.FEATURE_CONTEXT_MENU:
	EventLog.writeEvent(50000, 1, item.getTitleCondensed().toString());		if(titleCondensed != null) {
			EventLog.writeEvent(50000, 1, titleCondensed.toString());
			}
	if (onContextItemSelected(item)) {		if (onContextItemSelected(item)) {
	return true;		return true;
	}		}