Merge "Fix crash in finish from onCreate." into nyc-dev

2016-06-10 15:06:34 +00:00
parent 294b1586ed 656bc6004f
commit 1a1f6b0b1b
1 changed files with 4 additions and 1 deletions
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -690,7 +690,10 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF

    public void finish() {
        Activity activity = getActivity();
-        if (activity != null && !activity.getFragmentManager().popBackStackImmediate()) {
+        if (activity == null) return;
+        if (getFragmentManager().getBackStackEntryCount() > 0) {
+            getFragmentManager().popBackStack();
+        } else {
            activity.finish();
        }
    }