diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-02-06 17:20:07 -0800 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2013-02-27 12:47:21 -0800 |
| commit | b99c5b8eebb35133a08c46b015624bd4c4a6c477 (patch) | |
| tree | ce497f110ab59decf214e96d9258aae3f5555d05 /services/camera/libcameraservice/CameraService.cpp | |
| parent | 8b5c4ec7bbf253eb704094ab6b04f58923f67994 (diff) | |
| download | frameworks_av-b99c5b8eebb35133a08c46b015624bd4c4a6c477.zip frameworks_av-b99c5b8eebb35133a08c46b015624bd4c4a6c477.tar.gz frameworks_av-b99c5b8eebb35133a08c46b015624bd4c4a6c477.tar.bz2 | |
Camera: Start of support for version 3.0 of camera device HAL
- Refactor common CameraDevice interface out of Camera2Device
- Initial skeleton only for Camera3Device
Change-Id: I097cc76e2ad102a51712ac114235163245f5482c
Diffstat (limited to 'services/camera/libcameraservice/CameraService.cpp')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 1a78b53..d7c8807 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -244,9 +244,11 @@ sp<ICamera> CameraService::connect( break; case CAMERA_DEVICE_API_VERSION_2_0: case CAMERA_DEVICE_API_VERSION_2_1: + case CAMERA_DEVICE_API_VERSION_3_0: client = new Camera2Client(this, cameraClient, clientPackageName, cameraId, - facing, callingPid, clientUid, getpid()); + facing, callingPid, clientUid, getpid(), + deviceVersion); break; case -1: ALOGE("Invalid camera id %d", cameraId); |