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

This commit is contained in:
Adam Powell
2012-04-27 11:02:31 -07:00
committed by Android (Google) Code Review

View File

@@ -2714,7 +2714,7 @@ public class Activity extends ContextThemeWrapper
onCreateNavigateUpTaskStack(b); onCreateNavigateUpTaskStack(b);
onPrepareNavigateUpTaskStack(b); onPrepareNavigateUpTaskStack(b);
b.startActivities(); b.startActivities();
finish(); finishAffinity();
} else { } else {
navigateUpTo(upIntent); navigateUpTo(upIntent);
} }