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

am: 8cb8dd05a2 Change-Id: I6ffd30d4c9dfa7e1c335a13495c1e7d823066c79
2016-07-19 14:33:16 +00:00
parent 46669d91c6 8cb8dd05a2
commit 44c13b223f
1 changed files with 1 additions and 1 deletions
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -520,7 +520,7 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
        // To be able to dismiss dialog at that time, don't check
        // mDialogFragment.isVisible().
        if (mDialogFragment != null && mDialogFragment.getDialogId() == dialogId) {
-            mDialogFragment.dismiss();
+            mDialogFragment.dismissAllowingStateLoss();
        }
        mDialogFragment = null;
    }