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

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

Browse Source 
* commit 'a52b4792d134c257d0e897dbd39e6c1a53e30bb5':
  Fix EventLog string class problem in onOptionMenuSelected
This commit is contained in:
Adam Powell
2012-12-10 11:43:33 -08:00
committed by Android Git Automerger
parent e0d6015bdc a52b4792d1
commit 7da613fd5d
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
// doesn't call through to superclass's implmeentation of each
// of these methods below
EventLog.writeEvent(50000, 0, item.getTitleCondensed());
EventLog.writeEvent(50000, 0, item.getTitleCondensed().toString());
if (onOptionsItemSelected(item)) {
return true;
}
@ -2562,7 +2562,7 @@ public class Activity extends ContextThemeWrapper
return false;
case Window.FEATURE_CONTEXT_MENU:
EventLog.writeEvent(50000, 1, item.getTitleCondensed());
EventLog.writeEvent(50000, 1, item.getTitleCondensed().toString());
if (onContextItemSelected(item)) {
return true;
}