diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2012-03-15 21:23:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-15 21:23:24 -0700 |
| commit | 49f306f863b14f8bfc3b405ebfd3a2fb2b403c15 (patch) | |
| tree | d7c29856e1529b3337e5a2093fa1553c8818a3df /include/camera | |
| parent | 2f70d9f89a0461cafdbd84a3d8d65062f420d77a (diff) | |
| parent | 2fd2440d0175ca3e196b01b7541a9e0d4ed9a694 (diff) | |
| download | frameworks_av-49f306f863b14f8bfc3b405ebfd3a2fb2b403c15.zip frameworks_av-49f306f863b14f8bfc3b405ebfd3a2fb2b403c15.tar.gz frameworks_av-49f306f863b14f8bfc3b405ebfd3a2fb2b403c15.tar.bz2 | |
Merge "Add a new camera open API that allows taking the ownership."
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; }; // ---------------------------------------------------------------------------- |