diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-06-16 16:38:35 -0700 |
|---|---|---|
| committer | Zhijun He <zhijunhe@google.com> | 2014-06-19 15:41:09 -0700 |
| commit | b10cdadf0fb945e23ca77008d4af76584bd0e39a (patch) | |
| tree | d1fd0cc1c42aec025e8f6fc52f890b96e7203653 /services/camera/libcameraservice/CameraService.h | |
| parent | ab5cdbaf65ca509681d2726aacdf3ac8bfb6b3fa (diff) | |
| download | frameworks_av-b10cdadf0fb945e23ca77008d4af76584bd0e39a.zip frameworks_av-b10cdadf0fb945e23ca77008d4af76584bd0e39a.tar.gz frameworks_av-b10cdadf0fb945e23ca77008d4af76584bd0e39a.tar.bz2 | |
cameraservice: Implement HAL1 and higher HAL API coexistence
A higher hal version device like HAL3.2 can be opened as HAL1.0 device
if HAL supports it. This only applies to camera API1.
Change-Id: I4ae9f59f4317158cc1bd7ed7726e4032cdd1fa07
Diffstat (limited to 'services/camera/libcameraservice/CameraService.h')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h index b2b65b8..28590eb 100644 --- a/services/camera/libcameraservice/CameraService.h +++ b/services/camera/libcameraservice/CameraService.h @@ -83,6 +83,11 @@ public: /*out*/ sp<ICamera>& device); + virtual status_t connectLegacy(const sp<ICameraClient>& cameraClient, int cameraId, + int halVersion, const String16& clientPackageName, int clientUid, + /*out*/ + sp<ICamera>& device); + virtual status_t connectPro(const sp<IProCameraCallbacks>& cameraCb, int cameraId, const String16& clientPackageName, int clientUid, /*out*/ @@ -450,7 +455,8 @@ private: int clientUid, int callingPid, /*out*/ - sp<Client>& client); + sp<Client>& client, + int halVersion = CAMERA_HAL_API_VERSION_UNSPECIFIED); }; } // namespace android |