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

am: 1a1f6b0b1b Change-Id: Ibd2e867077c2906310dd3b37afe1b9c1ab02de72
2016-06-10 15:11:24 +00:00
parent 2d1d002eea 1a1f6b0b1b
commit 0fa8dc1b55
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();
        }
    }