diff options
author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-07-25 13:03:09 -0700 |
---|---|---|
committer | Fabrice Di Meglio <fdimeglio@google.com> | 2014-07-25 13:03:09 -0700 |
commit | b7bd72f297c9a33e7d819e3a309d304eac165919 (patch) | |
tree | 9842cd6e55213d30d911f4e5adf669992bc56d7f /src/com/android/settings/SettingsPreferenceFragment.java | |
parent | 9a60d7b5697873a41810fe87a89e60824e3548da (diff) | |
download | packages_apps_Settings-b7bd72f297c9a33e7d819e3a309d304eac165919.zip packages_apps_Settings-b7bd72f297c9a33e7d819e3a309d304eac165919.tar.gz packages_apps_Settings-b7bd72f297c9a33e7d819e3a309d304eac165919.tar.bz2 |
Fix bug #16533532 Settings app crashes on device orientation change
...when "change language" warning dialog is on screen
- try harder at getting the parent fragment. First try by calling
getParentFragment() and if this is getting a null reference, try
again by using the fragment Id saved during onSaveInstanceState()
Change-Id: I3dbc6a229224c8770ff2c7e432e76b8796c4b099
Diffstat (limited to 'src/com/android/settings/SettingsPreferenceFragment.java')
-rw-r--r-- | src/com/android/settings/SettingsPreferenceFragment.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java index 097fb95..38344fb 100644 --- a/src/com/android/settings/SettingsPreferenceFragment.java +++ b/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 |