summaryrefslogtreecommitdiff
path: root/include/camera/Camera.h
diff options
context:
space:
mode:
author Wu-cheng Li <wuchengli@google.com> 2012-02-23 19:01:00 -0800
committer Wu-cheng Li <wuchengli@google.com> 2012-03-15 14:50:48 +0800
commita1c41e13b521cdd611a8fc46e43b5ae0a2c00238 (patch)
tree48877fa91b94c62482519f040e966997a9d214d2 /include/camera/Camera.h
parent5571ffdd9d419e3b1e050501e6f8dbfb04159b5d (diff)
Add a new camera open API that allows taking the ownership.
The purpose is to let face unlock always get the camera successfully. What happened was the camera applications may have opened the camera in onResume under the lock screen. This API lets face unlock take the camera from the camera application. A new permission will be added, so other applicatoins won't be able to take the camera from the face unlock. bug:5584464 Change-Id: Ib3d9dcbc2161815b68db42327dc01148453704c6
Diffstat (limited to 'include/camera/Camera.h')
-rw-r--r--include/camera/Camera.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/camera/Camera.h b/include/camera/Camera.h
index 234e1657eef8..3fedea0f6b67 100644
--- a/include/camera/Camera.h
+++ b/include/camera/Camera.h
@@ -72,7 +72,7 @@ public:
static int32_t getNumberOfCameras();
static status_t getCameraInfo(int cameraId,
struct CameraInfo* cameraInfo);
- static sp<Camera> connect(int cameraId);
+ static sp<Camera> connect(int cameraId, bool force, bool keep);
virtual ~Camera();
void init();