Merge \\"Fix crash from dismissing after pause\\" into nyc-mr1-dev am: 8cb8dd05a2

am: 44c13b223f Change-Id: I155ca86eb959fe9b5553be59842e15639c19d4a2
2016-07-19 14:35:53 +00:00
parent 5757ce529f 44c13b223f
commit 6263c2f6d4
1 changed files with 1 additions and 1 deletions
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -513,7 +513,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;
    }