summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/SettingsPreferenceFragment.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-01-24 16:22:13 -0800
committerDianne Hackborn <hackbod@google.com>2011-01-24 21:18:41 -0800
commit0385cf14a1b02fafc3d1a094ccfee45de4e9b03a (patch)
tree9ff0095962d772bb1a524d85cc45b895ca11f838 /src/com/android/settings/SettingsPreferenceFragment.java
parent48e031c710acb812361d9689836b69b3ee5b5ac2 (diff)
downloadpackages_apps_Settings-0385cf14a1b02fafc3d1a094ccfee45de4e9b03a.zip
packages_apps_Settings-0385cf14a1b02fafc3d1a094ccfee45de4e9b03a.tar.gz
packages_apps_Settings-0385cf14a1b02fafc3d1a094ccfee45de4e9b03a.tar.bz2
Fix issue #3306021 NPE at android.app.AlertDialog.getDefaultDialogTheme(AlertDialog.java)
It looks like the dialog fragment was not being removed along with the containing fragment. The containing fragment now checks for when it is being removed and removes its dialog fragment at that point. Also fix issue #3340766 NPE at com.android.settings.applications.RunningProcessesView.startServiceDetailsActivity We need to check if the running processes view is still attached to its owner, since we clear owner when it is paused. In addition, fix a bug where ManageApplications was not persisting its "show background processes" state, and remove the icons from its menu items to make them more understandable in the action bar. Change-Id: I4498ef92023eb60f90758ff18d8eed7b41af79b0
Diffstat (limited to 'src/com/android/settings/SettingsPreferenceFragment.java')
-rw-r--r--src/com/android/settings/SettingsPreferenceFragment.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 47e31ee..09faf41 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -78,6 +78,17 @@ public class SettingsPreferenceFragment extends PreferenceFragment
return getActivity().getPackageManager();
}
+ @Override
+ public void onDetach() {
+ if (isRemoving()) {
+ if (mDialogFragment != null) {
+ mDialogFragment.dismiss();
+ mDialogFragment = null;
+ }
+ }
+ super.onDetach();
+ }
+
// Dialog management
protected void showDialog(int dialogId) {