PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix activity weirdness by doing the right thing" into nyc-dev

Browse Source
This commit is contained in:
Jason Monk
2016-02-10 17:57:28 +00:00
committed by Android (Google) Code Review
parent 779fdcca29 30e9fc870f
commit db26d19302
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/SettingsPreferenceFragment.java
View File

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