Commit bb2b9a7e authored by Jose Lima's avatar Jose Lima Committed by android-build-merger
Browse files

Fix crash in AOSP Camera app when recording video am: 35ad43ae

am: e1c8cd02

Change-Id: I4c95aaa4eb596de7c8e6417a0d54d23e01d5c27f
parents 7aa36b1f e1c8cd02
......@@ -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);
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment