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

Commit 686a805e authored by zobject's avatar zobject
Browse files

Fix NullpointException problem in onMenuItemSelected 

If both title and condensed title is null,
item.getTitleCondensed() could be return null value
in onMenuItemSelected. therefore need to check
whether retun value is null or not.

Change-Id: Ib08f52b949a794aa7bd6cc25414041e820f62969
parent bf8de6a3

core/java/android/app/Activity.java

+8 −2
Original line number Original line Diff line number Diff line
@@ -2539,12 +2539,16 @@ public class Activity extends ContextThemeWrapper 
     * Activity don't need to deal with feature codes.

     * Activity don't need to deal with feature codes.

     */

     */

    public boolean onMenuItemSelected(int featureId, MenuItem item) {

    public boolean onMenuItemSelected(int featureId, MenuItem item) {

        CharSequence titleCondensed = item.getTitleCondensed();



        switch (featureId) {

        switch (featureId) {

            case Window.FEATURE_OPTIONS_PANEL:

            case Window.FEATURE_OPTIONS_PANEL:

                // 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().toString());

                if(titleCondensed != null) {

                    EventLog.writeEvent(50000, 0, titleCondensed.toString());

                }

                if (onOptionsItemSelected(item)) {

                if (onOptionsItemSelected(item)) {

                    return true;

                    return true;

                }

                }
@@ -2562,7 +2566,9 @@ 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().toString());

                if(titleCondensed != null) {

                    EventLog.writeEvent(50000, 1, titleCondensed.toString());

                }

                if (onContextItemSelected(item)) {

                if (onContextItemSelected(item)) {

                    return true;

                    return true;

                }

                }