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 am: db26d19302

Browse Source 
am: 24f6a0eebc

* commit '24f6a0eebcd11652e4ed80b1b56a9754f5d9db60':
  Fix activity weirdness by doing the right thing
This commit is contained in:
Jason Monk
2016-02-10 18:14:08 +00:00
committed by android-build-merger
parent b246c6141d 24f6a0eebc
commit 22c9ed48d9
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() {
Activity activity = getActivity();
if (activity != null) {
activity.onBackPressed();
if (activity != null && !activity.getFragmentManager().popBackStackImmediate()) {
finish();
}
}