Automated import from //branches/donutburger/...@141469,141469
diff --git a/camera/libcameraservice/CameraService.h b/camera/libcameraservice/CameraService.h
index d9b7927..6752f26 100644
--- a/camera/libcameraservice/CameraService.h
+++ b/camera/libcameraservice/CameraService.h
@@ -27,6 +27,8 @@
namespace android {
+class MediaPlayer;
+
// ----------------------------------------------------------------------------
#define LIKELY( exp ) (__builtin_expect( (exp) != 0, true ))
@@ -178,6 +180,9 @@
sp<MemoryHeapBase> mPreviewBuffer;
int mPreviewCallbackFlag;
+ sp<MediaPlayer> mMediaPlayerClick;
+ sp<MediaPlayer> mMediaPlayerBeep;
+
// these are immutable once the object is created,
// they don't need to be protected by a lock
sp<ICameraClient> mCameraClient;