summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/CameraService.h
diff options
context:
space:
mode:
authorChien-Yu Chen <cychen@google.com>2015-10-14 23:36:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-10-14 23:36:51 +0000
commit5f54de483624a5731d82060bd3e1aab74b32b15e (patch)
treeec9f443ec03bac727740985f6ab08cf6038583a2 /services/camera/libcameraservice/CameraService.h
parent6e2ea5abb4344bf2e308a03ac488e93ab92778ab (diff)
parent82104ebbb2cc04277ab07b355f38f73045a11770 (diff)
downloadframeworks_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.h')
-rw-r--r--services/camera/libcameraservice/CameraService.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h
index cd97b08..4b0eeb7 100644
--- a/services/camera/libcameraservice/CameraService.h
+++ b/services/camera/libcameraservice/CameraService.h
@@ -159,7 +159,8 @@ public:
enum sound_kind {
SOUND_SHUTTER = 0,
- SOUND_RECORDING = 1,
+ SOUND_RECORDING_START = 1,
+ SOUND_RECORDING_STOP = 2,
NUM_SOUNDS
};