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

This commit is contained in:
Jason Monk
2016-07-19 14:28:50 +00:00
committed by Android (Google) Code Review

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;
} }