auto import from //branches/cupcake/...@125939
diff --git a/libs/ui/Camera.cpp b/libs/ui/Camera.cpp
index 9527009..4a325ac 100644
--- a/libs/ui/Camera.cpp
+++ b/libs/ui/Camera.cpp
@@ -136,6 +136,18 @@
return mCamera;
}
+status_t Camera::lock()
+{
+ if (mCamera != 0) return mCamera->lock();
+ return NO_INIT;
+}
+
+status_t Camera::unlock()
+{
+ if (mCamera != 0) return mCamera->unlock();
+ return NO_INIT;
+}
+
// pass the buffered ISurface to the camera service
status_t Camera::setPreviewDisplay(const sp<Surface>& surface)
{
@@ -172,6 +184,13 @@
mCamera->stopPreview();
}
+// get preview state
+bool Camera::previewEnabled()
+{
+ LOGV("previewEnabled");
+ return mCamera->previewEnabled();
+}
+
status_t Camera::autoFocus()
{
LOGV("autoFocus");