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

* commit 'e601efd375e79ae016593617f08d6a09a536f719': Fix a bug in Activity Up navigation dispatching
2012-05-09 01:45:12 -07:00
parent 1f455691fe e601efd375
commit c5967ab8de
1 changed files with 2 additions and 3 deletions
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -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;