diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-01-05 15:34:53 -0800 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2012-01-06 10:24:01 -0800 |
| commit | 60a78ac9535878984b0777788760b9ee7465c5e6 (patch) | |
| tree | ec9e13131339633dcd8a9785bdf0db7588020d95 /services/camera/libcameraservice/CameraService.h | |
| parent | 071ccd5a9702500f3f7d62ef881300914926184d (diff) | |
| download | frameworks_av-60a78ac9535878984b0777788760b9ee7465c5e6.zip frameworks_av-60a78ac9535878984b0777788760b9ee7465c5e6.tar.gz frameworks_av-60a78ac9535878984b0777788760b9ee7465c5e6.tar.bz2 | |
Switch camera sounds to always use the system enforced audio stream.
Instead of picking between the music stream and the enforced audio
stream, change the camera service to always play sounds through
enforced system stream. Also update the currently-hidden CameraSound
API to match.
Bug: 5778365
Change-Id: I3cc64b1d1ff567dbac8020a665d5b19846197ff3
Diffstat (limited to 'services/camera/libcameraservice/CameraService.h')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h index cdfbc56..bad41f5 100644 --- a/services/camera/libcameraservice/CameraService.h +++ b/services/camera/libcameraservice/CameraService.h @@ -76,7 +76,6 @@ private: void setCameraFree(int cameraId); // sounds - audio_stream_type_t mAudioStreamType; MediaPlayer* newMediaPlayer(const char *file); Mutex mSoundLock; |