summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorOwen Lin <owenlin@google.com>2009-05-04 17:10:37 -0700
committerOwen Lin <owenlin@google.com>2009-05-05 13:43:34 -0700
commit9e0bda23b8889b2149dbf47c8ec2de788a7f2bc9 (patch)
treee54bca5f555511ef67a6953ab86dbfbe0aec8a04 /src/com/android
parentf32ca41748bb0b84835f2bf851a3ad14b6fd7f72 (diff)
downloadLegacyCamera-9e0bda23b8889b2149dbf47c8ec2de788a7f2bc9.zip
LegacyCamera-9e0bda23b8889b2149dbf47c8ec2de788a7f2bc9.tar.gz
LegacyCamera-9e0bda23b8889b2149dbf47c8ec2de788a7f2bc9.tar.bz2
Fix bug 1710951. By moving image cleanning code to onStop.
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/camera/ViewImage.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/camera/ViewImage.java b/src/com/android/camera/ViewImage.java
index d4281a8..ef0857f 100644
--- a/src/com/android/camera/ViewImage.java
+++ b/src/com/android/camera/ViewImage.java
@@ -203,6 +203,7 @@ public class ViewImage extends Activity implements View.OnClickListener {
@Override
protected void onDestroy() {
+
// This is necessary to make the ZoomButtonsController unregister
// its configuration change receiver.
if (mZoomButtonsController != null) {
@@ -901,8 +902,8 @@ public class ViewImage extends Activity implements View.OnClickListener {
}
@Override
- public void onResume() {
- super.onResume();
+ public void onStart() {
+ super.onStart();
BitmapManager.instance().allowAllDecoding(false);
@@ -930,8 +931,8 @@ public class ViewImage extends Activity implements View.OnClickListener {
}
@Override
- public void onPause() {
- super.onPause();
+ public void onStop() {
+ super.onStop();
BitmapManager.instance().cancelAllDecoding();
mGetter.cancelCurrent();