Merge "Fix activity weirdness by doing the right thing" into nyc-dev (db26d193) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/SettingsPreferenceFragment.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -625,8 +625,8 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF

		public void finish() {
		Activity activity = getActivity();
		if (activity != null) {
		activity.onBackPressed();
		if (activity != null && !activity.getFragmentManager().popBackStackImmediate()) {
		finish();
		}
		}