am f2d75bc0: Merge "Use finishAffinity for automatic up navigation" into jb-dev

* commit 'f2d75bc09af45167915959b9b94c6958c3671e27': Use finishAffinity for automatic up navigation
2012-04-27 11:04:45 -07:00
parent ba7dc388de f2d75bc09a
commit 75e8637f44
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -2714,7 +2714,7 @@ public class Activity extends ContextThemeWrapper
                onCreateNavigateUpTaskStack(b);
                onPrepareNavigateUpTaskStack(b);
                b.startActivities();
-                finish();
+                finishAffinity();
            } else {
                navigateUpTo(upIntent);
            }