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

2016-02-10 17:57:28 +00:00
parent 779fdcca29 30e9fc870f
commit db26d19302
1 changed files with 2 additions and 2 deletions
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -625,8 +625,8 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF

    public void finish() {
        Activity activity = getActivity();
-        if (activity != null) {
-            activity.onBackPressed();
+        if (activity != null && !activity.getFragmentManager().popBackStackImmediate()) {
+            finish();
        }
    }