Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 262b311c: am b7de79d0: am 41bb82be: Merge "Fix NullpointException problem in onMenuItemSelected"

Browse Source 
* commit '262b311c3c7d68204a72d3ba87bd76883aec00e2':
  Fix NullpointException problem in onMenuItemSelected
This commit is contained in:
Adam Powell
2013-01-03 17:43:43 -08:00
committed by Android Git Automerger
parent 6d2b3fb397 262b311c3c
commit 4b816cc269
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/app/Activity.java
View File

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