diff options
| author | Adam Powell <adamp@google.com> | 2012-04-27 11:02:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-27 11:02:31 -0700 |
| commit | f2d75bc09af45167915959b9b94c6958c3671e27 (patch) | |
| tree | a56dbb4275418a331c9a8e7407638d68acc0351e | |
| parent | 11dea2945124b166f167d4b5a23a059f33c04fa1 (diff) | |
| parent | 897b1dd61063dbd41eeffa228eef9dc8e4f6b687 (diff) | |
| download | frameworks_base-f2d75bc09af45167915959b9b94c6958c3671e27.zip frameworks_base-f2d75bc09af45167915959b9b94c6958c3671e27.tar.gz frameworks_base-f2d75bc09af45167915959b9b94c6958c3671e27.tar.bz2 | |
Merge "Use finishAffinity for automatic up navigation" into jb-dev
| -rw-r--r-- | core/java/android/app/Activity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 4add7f4..ab245f5 100644 --- 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); } |