Fix activity weirdness by doing the right thing

Bug: 27091837 Change-Id: I983bcae15871b184e670a6baa819263e0ad58973

Fix activity weirdness by doing the right thing
Bug: 27091837 Change-Id: I983bcae15871b184e670a6baa819263e0ad58973
620940c8 · Jason Monk · The Android Automerger · e4739b3b · 620940c8
Commit 620940c8 authored Feb 10, 2016 by Jason Monk Committed by The Android Automerger Feb 10, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

src/com/android/settings/SettingsPreferenceFragment.java src/com/android/settings/SettingsPreferenceFragment.java +2 -2

No files found.
--- 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();
        }
    }