summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/api1
diff options
context:
space:
mode:
authorZhijun He <zhijunhe@google.com>2014-03-26 18:18:00 -0700
committerZhijun He <zhijunhe@google.com>2014-03-27 01:24:52 +0000
commit95dd5ba5bf83716f2eed5fe72366c4212464d710 (patch)
treeeb079faddf0fac3f259b9529f4171081105cf2db /services/camera/libcameraservice/api1
parentecdca392ed40e89a6ef14b86446e952c35497ac4 (diff)
downloadframeworks_av-95dd5ba5bf83716f2eed5fe72366c4212464d710.zip
frameworks_av-95dd5ba5bf83716f2eed5fe72366c4212464d710.tar.gz
frameworks_av-95dd5ba5bf83716f2eed5fe72366c4212464d710.tar.bz2
Camera3: fix HAL3.x version check issue
Camera service should support HAL3.x instead of only HAL3.0. Bug: 13609405 Change-Id: If7e86f9abe019547fc0be2e11337551cd7c57870
Diffstat (limited to 'services/camera/libcameraservice/api1')
-rw-r--r--services/camera/libcameraservice/api1/Camera2Client.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/api1/Camera2Client.cpp b/services/camera/libcameraservice/api1/Camera2Client.cpp
index 80b7cd4..0447979 100644
--- a/services/camera/libcameraservice/api1/Camera2Client.cpp
+++ b/services/camera/libcameraservice/api1/Camera2Client.cpp
@@ -118,7 +118,9 @@ status_t Camera2Client::initialize(camera_module_t *module)
mZslProcessorThread = zslProc;
break;
}
- case CAMERA_DEVICE_API_VERSION_3_0:{
+ case CAMERA_DEVICE_API_VERSION_3_0:
+ case CAMERA_DEVICE_API_VERSION_3_1:
+ case CAMERA_DEVICE_API_VERSION_3_2: {
sp<ZslProcessor3> zslProc =
new ZslProcessor3(this, mCaptureSequencer);
mZslProcessor = zslProc;