commit a52b4792d134c257d0e897dbd39e6c1a53e30bb5
author Adam Powell <adamp@android.com> Mon Dec 10 11:41:29 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Dec 10 11:41:29 2012 -0800
tree 3f9286e22d71323f84f0938e7c0f48ecf736c585
parent 81f91ce997ed71421ec9dfa0d628e848bfde6579
parent d692c2c6856072a3ec8bec4550466d15a9fef8d7

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

* commit 'd692c2c6856072a3ec8bec4550466d15a9fef8d7':
  Fix EventLog string class problem in onOptionMenuSelected

core/java/android/app/Activity.java

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 5dc9da2..f6b9a8e 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -2544,7 +2544,7 @@
                 // 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 @@
                 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;
                 }