Android/packages_apps_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 
am: db26d19302

* commit 'db26d19302ea7b0bd169907809b58044e7fbff10':
  Fix activity weirdness by doing the right thing
This commit is contained in:
Jason Monk
2016-02-10 18:06:56 +00:00
committed by android-build-merger
parent ab242afe1e db26d19302
commit 24f6a0eebc
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();
} }
} }