diff options
| 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 |
| commit | 2fd2440d0175ca3e196b01b7541a9e0d4ed9a694 (patch) | |
| tree | d87e4314688e65f4c53f04021c8452051d4b31eb /include/camera | |
| parent | cbcd6e869dd41158076e742a31c1ee410fc0c713 (diff) | |
| download | frameworks_av-2fd2440d0175ca3e196b01b7541a9e0d4ed9a694.zip frameworks_av-2fd2440d0175ca3e196b01b7541a9e0d4ed9a694.tar.gz frameworks_av-2fd2440d0175ca3e196b01b7541a9e0d4ed9a694.tar.bz2 | |
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')
| -rw-r--r-- | include/camera/Camera.h | 2 | ||||
| -rw-r--r-- | include/camera/ICameraService.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/camera/Camera.h b/include/camera/Camera.h index 234e165..3fedea0 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(); diff --git a/include/camera/ICameraService.h b/include/camera/ICameraService.h index 7d70c1e..97e3169 100644 --- a/include/camera/ICameraService.h +++ b/include/camera/ICameraService.h @@ -42,7 +42,7 @@ public: virtual status_t getCameraInfo(int cameraId, struct CameraInfo* cameraInfo) = 0; virtual sp<ICamera> connect(const sp<ICameraClient>& cameraClient, - int cameraId) = 0; + int cameraId, bool force, bool keep) = 0; }; // ---------------------------------------------------------------------------- |