commit db26d19302ea7b0bd169907809b58044e7fbff10
author Jason Monk <jmonk@google.com> Wed Feb 10 17:57:28 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 10 17:57:28 2016 +0000
tree a8c50bac2a55be15a8f50415796ba7113e466e13
parent 779fdcca29d1c87fd5dba7fd7198db182c39620c
parent 30e9fc870fae222e00239bd42c7c14f0fd40c7c2

Merge "Fix activity weirdness by doing the right thing" into nyc-dev

src/com/android/settings/SettingsPreferenceFragment.java

diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 55f8be3..74941d6 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -625,8 +625,8 @@
 
     public void finish() {
         Activity activity = getActivity();
-        if (activity != null) {
-            activity.onBackPressed();
+        if (activity != null && !activity.getFragmentManager().popBackStackImmediate()) {
+            finish();
         }
     }