commit 35ad43aeb0d810f1ce104d17556f447743756673
author Jose Lima <joselima@google.com> Tue Jun 21 15:54:02 2016 -0700
committer Jose Lima <joselima@google.com> Tue Jun 21 15:57:15 2016 -0700
tree a3551a3f6a8f266ae52a11104954e8b49482f9bf
parent 2dbf1d956fca4f709a4542ce24c44c38d46d7979

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

src/com/android/camera/VideoModule.java

diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index f16fc0a..3465953 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -1325,14 +1325,23 @@
         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);
+            }
         }
     }