PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'a6dbeae65f3c7e924adf5027469064660ba9e825':
  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:17:20 +00:00
committed by Android Git Automerger
parent 869d18af2d a6dbeae65f
commit 68bf583d86
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/SettingsPreferenceFragment.java
View File

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