summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/camera/CameraActivity.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 25735ed81..9cdda735b 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1862,9 +1862,13 @@ public class CameraActivity extends Activity
mSettingsManager = null;
mOrientationManager = null;
mButtonManager = null;
- CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.API_1);
- CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.AUTO);
mSoundPlayer.release();
+ try {
+ CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.API_1);
+ CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.AUTO);
+ } catch (RuntimeException e) {
+ Log.e(TAG, "CameraAgentFactory exception during destroy", e);
+ }
super.onDestroy();
}