drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d692c2c6: Merge "Fix EventLog string class problem in onOptionMenuSelected"

Browse Source 
* commit 'd692c2c6856072a3ec8bec4550466d15a9fef8d7':
  Fix EventLog string class problem in onOptionMenuSelected
This commit is contained in:
Adam Powell
2012-12-10 11:41:29 -08:00
committed by Android Git Automerger
parent 81f91ce997 d692c2c685
commit a52b4792d1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2544,7 +2544,7 @@ public class Activity extends ContextThemeWrapper
// 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()); EventLog.writeEvent(50000, 0, item.getTitleCondensed().toString());
if (onOptionsItemSelected(item)) { if (onOptionsItemSelected(item)) {
return true; return true;
} }
@ -2562,7 +2562,7 @@ 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()); EventLog.writeEvent(50000, 1, item.getTitleCondensed().toString());
if (onContextItemSelected(item)) { if (onContextItemSelected(item)) {
return true; return true;
} }