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

src/com/android/settings/SettingsPreferenceFragment.java

@@ -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