From 3200ab3acf775fa4651c90e64e8d6ad5ea8dd2e0 Mon Sep 17 00:00:00 2001
From: Alan Newberger <alann@google.com>
Date: Thu, 2 Oct 2014 10:50:07 -0700
Subject: Trap CameraAgentFactory RTEs during recycle

Bug: 17759456
Change-Id: I5d6577f4175963168bb4186d70dd7cee68b5466e
(cherry picked from commit 4d0fe41c92819ac4c70b5d0e75ec544be6cdfbb1)
---
 src/com/android/camera/CameraActivity.java | 8 ++++++--
 1 file 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();
     }
 
-- 
cgit v1.2.3