summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorchiz <chiz@codeaurora.org>2013-10-15 14:42:20 +0800
committerSteve Kondik <shade@chemlab.org>2013-10-18 15:54:49 -0700
commitf7e02fecb29bee4743191ea7c91feac20af63d37 (patch)
treed7ee7babfccb4d9f28988ff9f4a1fb4d3231900f /src
parent0e974f90f3526418ffed34f18cee800f90906008 (diff)
downloadandroid_packages_apps_Gallery2-f7e02fecb29bee4743191ea7c91feac20af63d37.tar.gz
android_packages_apps_Gallery2-f7e02fecb29bee4743191ea7c91feac20af63d37.tar.bz2
android_packages_apps_Gallery2-f7e02fecb29bee4743191ea7c91feac20af63d37.zip
camera: fix VideoModule memory leak
Layout change listener should be removed when module onpause, otherwise the VideoModule will not be able to release. Change-Id: I929526cae01b549044fef305d5af247b41420b0a CRs-Fixed: 549757
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/VideoModule.java1
-rw-r--r--src/com/android/camera/VideoUI.java4
2 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 67bc9165e..bd5f2ccd7 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -1139,6 +1139,7 @@ public class VideoModule implements CameraModule,
mReceiver = null;
}
resetScreenOn();
+ mUI.onPause();
if (mLocationManager != null) mLocationManager.recordLocation(false);
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index c4765eaab..b5559c69d 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -373,6 +373,10 @@ public class VideoUI implements SurfaceHolder.Callback, PieRenderer.PieListener,
}
}
+ public void onPause() {
+ mRootView.removeOnLayoutChangeListener(mLayoutListener);
+ }
+
// PieListener
@Override
public void onPieOpened(int centerX, int centerY) {