diff options
| author | Winson Chung <winsonc@google.com> | 2012-03-26 10:53:01 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-26 10:53:01 -0700 |
| commit | 568c659352cfe6c3ff87d294f8b8df9bc8f55335 (patch) | |
| tree | 57abf474a46cbc661e04a1f715bcd45f6ee13890 /src | |
| parent | 7bdeb601f952efd3b14ff9402a204f775c88cc85 (diff) | |
| parent | 97ea93e52153fe6ab6b6a362a387603ae5eae145 (diff) | |
| download | android_packages_apps_Trebuchet-568c659352cfe6c3ff87d294f8b8df9bc8f55335.tar.gz android_packages_apps_Trebuchet-568c659352cfe6c3ff87d294f8b8df9bc8f55335.tar.bz2 android_packages_apps_Trebuchet-568c659352cfe6c3ff87d294f8b8df9bc8f55335.zip | |
Merge "Fixing potential issue where loader was still running after the fragment was detached. (Bug 5682275)"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/WallpaperChooserDialogFragment.java | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/com/android/launcher2/WallpaperChooserDialogFragment.java b/src/com/android/launcher2/WallpaperChooserDialogFragment.java index 030d33d9f..eec699e35 100644 --- a/src/com/android/launcher2/WallpaperChooserDialogFragment.java +++ b/src/com/android/launcher2/WallpaperChooserDialogFragment.java @@ -82,10 +82,7 @@ public class WallpaperChooserDialogFragment extends DialogFragment implements outState.putBoolean(EMBEDDED_KEY, mEmbedded); } - @Override - public void onDestroy() { - super.onDestroy(); - + private void cancelLoader() { if (mLoader != null && mLoader.getStatus() != WallpaperLoader.Status.FINISHED) { mLoader.cancel(true); mLoader = null; @@ -93,6 +90,20 @@ public class WallpaperChooserDialogFragment extends DialogFragment implements } @Override + public void onDetach() { + super.onDetach(); + + cancelLoader(); + } + + @Override + public void onDestroy() { + super.onDestroy(); + + cancelLoader(); + } + + @Override public void onDismiss(DialogInterface dialog) { super.onDismiss(dialog); /* On orientation changes, the dialog is effectively "dismissed" so this is called |