diff options
| author | Jose Lima <joselima@google.com> | 2016-06-22 00:56:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-22 00:56:17 +0000 |
| commit | e7eccc1af1377cdce2ec14404006b83a3da95c1e (patch) | |
| tree | 980918211ce83d4df6f9a56b23c28fa02acc17d8 | |
| parent | ecf0c3f9df014ff1d2b2b59641cf168b7ea027d6 (diff) | |
| parent | 35ad43aeb0d810f1ce104d17556f447743756673 (diff) | |
| download | android_packages_apps_Camera2-e7eccc1af1377cdce2ec14404006b83a3da95c1e.tar.gz android_packages_apps_Camera2-e7eccc1af1377cdce2ec14404006b83a3da95c1e.tar.bz2 android_packages_apps_Camera2-e7eccc1af1377cdce2ec14404006b83a3da95c1e.zip | |
Fix crash in AOSP Camera app when recording video
am: 35ad43aeb0
Change-Id: I00419eeb8bec9f02cdbb41c3e85d7272ace43a26
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index f16fc0a16..34659533f 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1325,14 +1325,23 @@ public class VideoModule extends CameraModule mOriginalRingerMode = mAudioManager.getRingerMode(); // Make sure no system sounds and vibrations happen during video // recording. - mAudioManager.setRingerMode(AudioManager.RINGER_MODE_SILENT); + try { + mAudioManager.setRingerMode(AudioManager.RINGER_MODE_SILENT); + } catch (SecurityException e) { + Log.e(TAG, "Error: " + e); + } } private void restoreRingerMode() { // First check if ringer mode was changed during the recording. If not, // re-set the mode that was set before video recording started. if (mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_SILENT) { - mAudioManager.setRingerMode(mOriginalRingerMode); + // Set the original ringer mode back. + try { + mAudioManager.setRingerMode(mOriginalRingerMode); + } catch (SecurityException e) { + Log.e(TAG, "Error: " + e); + } } } |