Merge \\\"Fix crash in finish from onCreate.\\\" into nyc-dev am: 1a1f6b0b1b am: 0fa8dc1b55

am: 4d86173586 Change-Id: I342042c107ea6cf8dcdcefd9d31b53232a8440ff
2016-06-10 15:17:20 +00:00
parent 38f2bca7b3 4d86173586
commit 2f40b22d41
1 changed files with 4 additions and 1 deletions
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -683,7 +683,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();
        }
    }