Merge \"Fix crash from dismissing after pause\" into nyc-mr1-dev

am: 8cb8dd05a2

Change-Id: I6ffd30d4c9dfa7e1c335a13495c1e7d823066c79
This commit is contained in:
Jason Monk
2016-07-19 14:33:16 +00:00
committed by android-build-merger

View File

@@ -520,7 +520,7 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
// To be able to dismiss dialog at that time, don't check // To be able to dismiss dialog at that time, don't check
// mDialogFragment.isVisible(). // mDialogFragment.isVisible().
if (mDialogFragment != null && mDialogFragment.getDialogId() == dialogId) { if (mDialogFragment != null && mDialogFragment.getDialogId() == dialogId) {
mDialogFragment.dismiss(); mDialogFragment.dismissAllowingStateLoss();
} }
mDialogFragment = null; mDialogFragment = null;
} }