Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a1f6b0b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 294b1586 656bc600

src/com/android/settings/SettingsPreferenceFragment.java

+4 −1
Original line number Diff line number Diff line
@@ -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();

        }

    }