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

Commit 0fa8dc1b authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

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

am: 1a1f6b0b

Change-Id: Ibd2e867077c2906310dd3b37afe1b9c1ab02de72
parents 2d1d002e 1a1f6b0b

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();

        }

    }