am c973fab0: am 68bf583d: am a6dbeae6: Merge "Fix bug #16533532 Settings app crashes on device orientation change ...when "change language" warning dialog is on screen" into lmp-dev

* commit 'c973fab0ca5f3ec90a2711c5424212e39f016d95':
  Fix bug #16533532 Settings app crashes on device orientation change ...when "change language" warning dialog is on screen
This commit is contained in:
Fabrice Di Meglio
2014-07-25 20:25:43 +00:00
committed by Android Git Automerger

View File

@@ -412,6 +412,9 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di
mDialogId = savedInstanceState.getInt(KEY_DIALOG_ID, 0);
mParentFragment = getParentFragment();
int mParentFragmentId = savedInstanceState.getInt(KEY_PARENT_FRAGMENT_ID, -1);
if (mParentFragment == null) {
mParentFragment = getFragmentManager().findFragmentById(mParentFragmentId);
}
if (!(mParentFragment instanceof DialogCreatable)) {
throw new IllegalArgumentException(
(mParentFragment != null