diff options
| author | Eric Laurent <elaurent@google.com> | 2009-07-17 12:17:14 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2009-07-23 06:03:39 -0700 |
| commit | a553c25b33c99b345cf1c8688f8df0ed8df14e5a (patch) | |
| tree | 025c461b13e66ad0ceac8d0f8d9b13fd88ae168a /camera | |
| parent | ebd7bc54028949619bbf3fa5ed6c1188f588c230 (diff) | |
| download | frameworks_base-a553c25b33c99b345cf1c8688f8df0ed8df14e5a.zip frameworks_base-a553c25b33c99b345cf1c8688f8df0ed8df14e5a.tar.gz frameworks_base-a553c25b33c99b345cf1c8688f8df0ed8df14e5a.tar.bz2 | |
Fix issue 1795088 Improve audio routing code
Initial commit for review.
Integrated comments after patch set 1 review.
Fixed lockup in AudioFlinger::ThreadBase::exit()
Fixed lockup when playing tone with AudioPlocyService startTone()
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/libcameraservice/CameraService.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp index 97b43a4..e7c1fbb 100644 --- a/camera/libcameraservice/CameraService.cpp +++ b/camera/libcameraservice/CameraService.cpp @@ -33,7 +33,6 @@ #include "CameraService.h" #include <cutils/atomic.h> -#include <cutils/properties.h> namespace android { @@ -199,13 +198,7 @@ static sp<MediaPlayer> newMediaPlayer(const char *file) { sp<MediaPlayer> mp = new MediaPlayer(); if (mp->setDataSource(file) == NO_ERROR) { - 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->setAudioStreamType(AudioSystem::ENFORCED_AUDIBLE); mp->prepare(); } else { mp.clear(); |