diff options
author | Romain Guy <romainguy@android.com> | 2009-09-14 15:26:18 -0700 |
---|---|---|
committer | Romain Guy <romainguy@android.com> | 2009-09-14 15:26:18 -0700 |
commit | 4e55c778463c11d1c9bbdaa70714d4e4b5de662c (patch) | |
tree | f9ffe156a3aac8a4b9ebda6ad247e3198ff58bd5 | |
parent | 432e495b239103a9688633796d940a08b27dcc05 (diff) | |
download | android_packages_apps_Trebuchet-4e55c778463c11d1c9bbdaa70714d4e4b5de662c.tar.gz android_packages_apps_Trebuchet-4e55c778463c11d1c9bbdaa70714d4e4b5de662c.tar.bz2 android_packages_apps_Trebuchet-4e55c778463c11d1c9bbdaa70714d4e4b5de662c.zip |
Properly destroy background loader in onDestroy().
Change-Id: I6069262f9ebb46d01f15ca64332ce600db2f899c
-rw-r--r-- | src/com/android/launcher2/WallpaperChooser.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/com/android/launcher2/WallpaperChooser.java b/src/com/android/launcher2/WallpaperChooser.java index 46f770fc4..386ae970c 100644 --- a/src/com/android/launcher2/WallpaperChooser.java +++ b/src/com/android/launcher2/WallpaperChooser.java @@ -45,7 +45,6 @@ public class WallpaperChooser extends Activity implements AdapterView.OnItemSele private ImageView mImageView; private boolean mIsWallpaperSet; - private BitmapFactory.Options mOptions; private Bitmap mBitmap; private ArrayList<Integer> mThumbs; @@ -104,6 +103,16 @@ public class WallpaperChooser extends Activity implements AdapterView.OnItemSele mIsWallpaperSet = false; } + @Override + protected void onDestroy() { + super.onDestroy(); + + if (mLoader != null && mLoader.getStatus() != WallpaperLoader.Status.FINISHED) { + mLoader.cancel(true); + mLoader = null; + } + } + public void onItemSelected(AdapterView parent, View v, int position, long id) { if (mLoader != null && mLoader.getStatus() != WallpaperLoader.Status.FINISHED) { mLoader.cancel(true); @@ -199,6 +208,10 @@ public class WallpaperChooser extends Activity implements AdapterView.OnItemSele drawable.setDither(true); view.postInvalidate(); + + mLoader = null; + } else { + b.recycle(); } } } |