diff options
| author | Alan Newberger <alann@google.com> | 2014-10-02 10:50:07 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2014-10-02 11:40:03 -0700 |
| commit | b89df00529afc88eadc725414527f5aee041106f (patch) | |
| tree | 099bb2a90a15bdc6ec1a6c29d024675355e4909c | |
| parent | aa27d014fcc70b799dfe38026308b017983366f1 (diff) | |
| download | android_packages_apps_Camera2-b89df00529afc88eadc725414527f5aee041106f.tar.gz android_packages_apps_Camera2-b89df00529afc88eadc725414527f5aee041106f.tar.bz2 android_packages_apps_Camera2-b89df00529afc88eadc725414527f5aee041106f.zip | |
Trap CameraAgentFactory RTEs during recycle
Bug: 17759456
Change-Id: I5d6577f4175963168bb4186d70dd7cee68b5466e
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 5fac0a803..471c2757d 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1871,9 +1871,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(); } |