diff options
| author | Adam Powell <adamp@android.com> | 2012-12-10 11:09:32 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-12-10 11:09:32 -0800 |
| commit | d692c2c6856072a3ec8bec4550466d15a9fef8d7 (patch) | |
| tree | ff93baf4357a301c356e0f8f2f50927b45882f8b /core/java/android | |
| parent | 261bc70411ba1dd58654c4eb1c91acbbcfb49060 (diff) | |
| parent | 332944f8a0a001c1754ce3298edbb4246e53c8fb (diff) | |
Merge "Fix EventLog string class problem in onOptionMenuSelected"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/Activity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 5dc9da285ee9..f6b9a8e096ed 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -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; } |