summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2016-08-25 00:44:48 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-08-25 00:44:48 +0000
commit917ac82ac0c006c1cefbd89c990b42f8209fafce (patch)
tree7c05adc7329a22e9fdce313d66e5648e37aaef7c
parentc45aaf531cfd4f17457bb8cbbaf1ca31fbf08344 (diff)
parentaaae0ae1bbb4a32720cc742c9c3dfb06875835d5 (diff)
downloadandroid_packages_apps_Camera2-917ac82ac0c006c1cefbd89c990b42f8209fafce.tar.gz
android_packages_apps_Camera2-917ac82ac0c006c1cefbd89c990b42f8209fafce.tar.bz2
android_packages_apps_Camera2-917ac82ac0c006c1cefbd89c990b42f8209fafce.zip
Remove calls to silence ringer; these require new permissions in N
am: aaae0ae1bb Change-Id: I4ab0ffdb9aedd555a8cfcf6a2401d7dd0d4fde6b
-rw-r--r--src/com/android/camera/VideoModule.java15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 34659533f..9a941c73e 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -1323,25 +1323,14 @@ public class VideoModule extends CameraModule
// Store current ringer mode so we can set it once video recording is
// finished.
mOriginalRingerMode = mAudioManager.getRingerMode();
- // Make sure no system sounds and vibrations happen during video
- // recording.
- try {
- mAudioManager.setRingerMode(AudioManager.RINGER_MODE_SILENT);
- } catch (SecurityException e) {
- Log.e(TAG, "Error: " + e);
- }
+ // TODO: Use new DND APIs to properly silence device
}
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) {
- // Set the original ringer mode back.
- try {
- mAudioManager.setRingerMode(mOriginalRingerMode);
- } catch (SecurityException e) {
- Log.e(TAG, "Error: " + e);
- }
+ // TODO: Use new DND APIs to properly restore device notification/alarm settings
}
}