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

am: 02ef5603b3

* commit '02ef5603b311e82ce3d849959c26b77723294eb5':
  Fixes stack overflow on some settings preferences
This commit is contained in:
Udam Saini
2016-02-11 00:40:12 +00:00
committed by android-build-merger

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