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

Fix crash in finish from onCreate.

Browse Source 
Change-Id: Ia4937fecdc93e30a468b8fefd2f8776186c8e151
Fixes: 29245324
This commit is contained in:
Jason Monk
2016-06-10 09:49:12 -04:00
parent 7f7092c705
commit 656bc6004f
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

@@ -690,7 +690,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();
} }
} }