diff options
| author | Eric Laurent <> | 2009-03-26 01:57:59 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-26 01:57:59 -0700 |
| commit | eeea9222132fe5979e40dcc85f5eba300157dfbc (patch) | |
| tree | 222d6010f339edc928cfde08d716e21430197367 /camera/libcameraservice/CameraService.cpp | |
| parent | cc95667b9cb1c8e61b4addd6b1aff7f09902d5c8 (diff) | |
| download | frameworks_base-eeea9222132fe5979e40dcc85f5eba300157dfbc.zip frameworks_base-eeea9222132fe5979e40dcc85f5eba300157dfbc.tar.gz frameworks_base-eeea9222132fe5979e40dcc85f5eba300157dfbc.tar.bz2 | |
Automated import from //branches/cupcake/...@142889,142889
Diffstat (limited to 'camera/libcameraservice/CameraService.cpp')
| -rw-r--r-- | camera/libcameraservice/CameraService.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp index 7e5fdbe..cb8ab58 100644 --- a/camera/libcameraservice/CameraService.cpp +++ b/camera/libcameraservice/CameraService.cpp @@ -32,6 +32,8 @@ #include <media/AudioSystem.h> #include "CameraService.h" +#include <cutils/properties.h> + namespace android { extern "C" { @@ -157,7 +159,13 @@ static sp<MediaPlayer> newMediaPlayer(const char *file) { sp<MediaPlayer> mp = new MediaPlayer(); if (mp->setDataSource(file) == NO_ERROR) { - mp->setAudioStreamType(AudioSystem::ALARM); + char value[PROPERTY_VALUE_MAX]; + property_get("ro.camera.sound.forced", value, "0"); + if (atoi(value)) { + mp->setAudioStreamType(AudioSystem::ENFORCED_AUDIBLE); + } else { + mp->setAudioStreamType(AudioSystem::SYSTEM); + } mp->prepare(); } else { mp.clear(); |