diff options
| author | Alan Newberger <alann@google.com> | 2014-10-02 10:50:07 -0700 |
|---|---|---|
| committer | Alan Newberger <alann@google.com> | 2014-10-02 17:55:59 +0000 |
| commit | 3200ab3acf775fa4651c90e64e8d6ad5ea8dd2e0 (patch) | |
| tree | 231689f94f259a97cb0fca21d42152bd1db559c4 | |
| parent | e1eb82bcd8050608ec3bda7ddcb7c0de961d93bd (diff) | |
| download | android_packages_apps_Camera2-3200ab3acf775fa4651c90e64e8d6ad5ea8dd2e0.tar.gz android_packages_apps_Camera2-3200ab3acf775fa4651c90e64e8d6ad5ea8dd2e0.tar.bz2 android_packages_apps_Camera2-3200ab3acf775fa4651c90e64e8d6ad5ea8dd2e0.zip | |
Trap CameraAgentFactory RTEs during recycle
Bug: 17759456
Change-Id: I5d6577f4175963168bb4186d70dd7cee68b5466e
(cherry picked from commit 4d0fe41c92819ac4c70b5d0e75ec544be6cdfbb1)
| -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 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(); } |