diff options
author | Chien-Yu Chen <cychen@google.com> | 2015-10-14 23:36:51 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-14 23:36:51 +0000 |
commit | 5f54de483624a5731d82060bd3e1aab74b32b15e (patch) | |
tree | ec9f443ec03bac727740985f6ab08cf6038583a2 /services/camera/libcameraservice/CameraService.cpp | |
parent | 6e2ea5abb4344bf2e308a03ac488e93ab92778ab (diff) | |
parent | 82104ebbb2cc04277ab07b355f38f73045a11770 (diff) | |
download | frameworks_av-5f54de483624a5731d82060bd3e1aab74b32b15e.zip frameworks_av-5f54de483624a5731d82060bd3e1aab74b32b15e.tar.gz frameworks_av-5f54de483624a5731d82060bd3e1aab74b32b15e.tar.bz2 |
Merge "Camera: Add video recording stop sound" into mnc-dr-dev
Diffstat (limited to 'services/camera/libcameraservice/CameraService.cpp')
-rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 2aaefe9..19f588a 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -1831,7 +1831,8 @@ void CameraService::loadSound() { if (mSoundRef++) return; mSoundPlayer[SOUND_SHUTTER] = newMediaPlayer("/system/media/audio/ui/camera_click.ogg"); - mSoundPlayer[SOUND_RECORDING] = newMediaPlayer("/system/media/audio/ui/VideoRecord.ogg"); + mSoundPlayer[SOUND_RECORDING_START] = newMediaPlayer("/system/media/audio/ui/VideoRecord.ogg"); + mSoundPlayer[SOUND_RECORDING_STOP] = newMediaPlayer("/system/media/audio/ui/VideoStop.ogg"); } void CameraService::releaseSound() { |