diff options
author | Jose Lima <joselima@google.com> | 2016-06-21 15:54:02 -0700 |
---|---|---|
committer | Jose Lima <joselima@google.com> | 2016-06-21 15:57:15 -0700 |
commit | 35ad43aeb0d810f1ce104d17556f447743756673 (patch) | |
tree | a3551a3f6a8f266ae52a11104954e8b49482f9bf /src | |
parent | 2dbf1d956fca4f709a4542ce24c44c38d46d7979 (diff) | |
download | android_packages_apps_Camera2-35ad43aeb0d810f1ce104d17556f447743756673.tar.gz android_packages_apps_Camera2-35ad43aeb0d810f1ce104d17556f447743756673.tar.bz2 android_packages_apps_Camera2-35ad43aeb0d810f1ce104d17556f447743756673.zip |
Fix crash in AOSP Camera app when recording video
- Don't allow security exception to crash the app, if it has not been
granted DND access, and log the error instead.
Bug: 27928399
Change-Id: I4dc5b3f3b83cdf93d8cbe9299c987e58b46164de
Diffstat (limited to 'src')
-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); + } } } |