summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2014-07-22 16:55:29 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-22 16:13:36 +0000
commit6a4ce9407e942fca74137631a67686eeb3e35e3b (patch)
treeb7d9b5a4944d1b6ee690c2f154feb69206b48ef3
parent224ee988fce0f85ea65a58ad6e17913e8f813ec7 (diff)
parente9bacd9c2b4e701f21be16eca46805d092eebebd (diff)
downloadandroid_packages_apps_Trebuchet-6a4ce9407e942fca74137631a67686eeb3e35e3b.tar.gz
android_packages_apps_Trebuchet-6a4ce9407e942fca74137631a67686eeb3e35e3b.tar.bz2
android_packages_apps_Trebuchet-6a4ce9407e942fca74137631a67686eeb3e35e3b.zip
Merge "Fixing memory leak in WallpaperCropActivity" into ub-now-master
-rw-r--r--WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
index 6c58da0a8..8652d85bc 100644
--- a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
+++ b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
@@ -133,6 +133,14 @@ public class WallpaperCropActivity extends Activity {
setCropViewTileSource(bitmapSource, true, false, onLoad);
}
+ @Override
+ protected void onDestroy() {
+ if (mCropView != null) {
+ mCropView.destroy();
+ }
+ super.onDestroy();
+ }
+
public void setCropViewTileSource(
final BitmapRegionTileSource.BitmapSource bitmapSource, final boolean touchEnabled,
final boolean moveToLeft, final Runnable postExecute) {