Merge "Fixes stack overflow on some settings preferences" into nyc-dev

This commit is contained in:
Udam Saini
2016-02-11 00:36:13 +00:00
committed by Android (Google) Code Review

View File

@@ -626,7 +626,7 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
public void finish() { public void finish() {
Activity activity = getActivity(); Activity activity = getActivity();
if (activity != null && !activity.getFragmentManager().popBackStackImmediate()) { if (activity != null && !activity.getFragmentManager().popBackStackImmediate()) {
finish(); activity.finish();
} }
} }