Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7da613fd authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

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

* commit 'a52b4792':
  Fix EventLog string class problem in onOptionMenuSelected
parents e0d6015b a52b4792

core/java/android/app/Activity.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

                }