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

Commit e601efd3 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix a bug in Activity Up navigation dispatching" into jb-dev

parents 2fd54c41 07304f52

core/java/android/app/Activity.java

+2 −3
Original line number Diff line number Diff line
@@ -2540,11 +2540,10 @@ public class Activity extends ContextThemeWrapper 
                if (item.getItemId() == android.R.id.home && mActionBar != null &&

                        (mActionBar.getDisplayOptions() & ActionBar.DISPLAY_HOME_AS_UP) != 0) {

                    if (mParent == null) {

                        onNavigateUp();

                        return onNavigateUp();

                    } else {

                        mParent.onNavigateUpFromChild(this);

                        return mParent.onNavigateUpFromChild(this);

                    }

                    return true;

                }

                return false;