Commit 620940c8 authored by Jason Monk's avatar Jason Monk Committed by The Android Automerger

Fix activity weirdness by doing the right thing

Bug: 27091837
Change-Id: I983bcae15871b184e670a6baa819263e0ad58973
parent e4739b3b
......@@ -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();
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment