diff options
| author | Alan Newberger <alann@google.com> | 2014-10-05 18:57:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-05 18:57:27 +0000 |
| commit | d30fdee360db38e93e4639bd1c28049d0b6b09e0 (patch) | |
| tree | 8c8d2a3f05bc9c3812f6d12ca26b9d7507175b03 | |
| parent | b0be8f5321605380110ca03a3ae6880b042fe187 (diff) | |
| parent | 3200ab3acf775fa4651c90e64e8d6ad5ea8dd2e0 (diff) | |
| download | android_packages_apps_Camera2-d30fdee360db38e93e4639bd1c28049d0b6b09e0.tar.gz android_packages_apps_Camera2-d30fdee360db38e93e4639bd1c28049d0b6b09e0.tar.bz2 android_packages_apps_Camera2-d30fdee360db38e93e4639bd1c28049d0b6b09e0.zip | |
Merge "Trap CameraAgentFactory RTEs during recycle" into lmp-dev
| -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(); } |