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

Merge \\\"Fix crash in finish from onCreate.\\\" into nyc-dev am: 1a1f6b0b1b am: 0fa8dc1b55

Browse Source 
am: 4d86173586

Change-Id: I342042c107ea6cf8dcdcefd9d31b53232a8440ff
This commit is contained in:
Jason Monk
2016-06-10 15:17:20 +00:00
committed by android-build-merger
parent 38f2bca7b3 4d86173586
commit 2f40b22d41
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -683,7 +683,10 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
public void finish() { public void finish() {
Activity activity = getActivity(); Activity activity = getActivity();
if (activity != null && !activity.getFragmentManager().popBackStackImmediate()) { if (activity == null) return;
if (getFragmentManager().getBackStackEntryCount() > 0) {
getFragmentManager().popBackStack();
} else {
activity.finish(); activity.finish();
} }
} }