diff options
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/provider/2.4-legacy/Android.bp | 1 | ||||
| -rw-r--r-- | camera/provider/2.4-legacy/CameraProvider.cpp | 68 | ||||
| -rw-r--r-- | camera/provider/2.4-legacy/CameraProvider.h | 1 |
3 files changed, 3 insertions, 67 deletions
diff --git a/camera/provider/2.4-legacy/Android.bp b/camera/provider/2.4-legacy/Android.bp index bbf04b1..e95ad89 100644 --- a/camera/provider/2.4-legacy/Android.bp +++ b/camera/provider/2.4-legacy/Android.bp @@ -11,7 +11,6 @@ cc_library_shared { "libcutils", "android.hardware.camera.device@1.0", "camera.device@1.0-impl-legacy", - "camera.device@3.2-impl", "android.hardware.camera.provider@2.4", "android.hardware.camera.common@1.0", "android.hardware.graphics.mapper@2.0", diff --git a/camera/provider/2.4-legacy/CameraProvider.cpp b/camera/provider/2.4-legacy/CameraProvider.cpp index 374ff7b..877d826 100644 --- a/camera/provider/2.4-legacy/CameraProvider.cpp +++ b/camera/provider/2.4-legacy/CameraProvider.cpp @@ -19,7 +19,6 @@ #include "CameraProvider.h" #include "CameraDevice_1_0.h" -#include "CameraDevice_3_2.h" #include <string.h> #include <utils/Trace.h> @@ -134,21 +133,6 @@ std::string CameraProvider::getLegacyCameraId(const hidl_string& deviceName) { return cameraId; } -int CameraProvider::getCameraDeviceVersion(const hidl_string& deviceName) { - std::string deviceVersion; - bool match = matchDeviceName(deviceName, &deviceVersion, nullptr); - if (!match) { - return -1; - } - if (deviceVersion == kHAL3_2) { - // maybe switched to 3.4 or define the hidl version enum later - return CAMERA_DEVICE_API_VERSION_3_2; - } else if (deviceVersion == kHAL1_0) { - return CAMERA_DEVICE_API_VERSION_1_0; - } - return 0; -} - std::string CameraProvider::getHidlDeviceName( std::string cameraId, int deviceVersion) { // Maybe consider create a version check method and SortedVec to speed up? @@ -430,55 +414,9 @@ Return<void> CameraProvider::getCameraDeviceInterface_V1_x( } Return<void> CameraProvider::getCameraDeviceInterface_V3_x( - const hidl_string& cameraDeviceName, getCameraDeviceInterface_V3_x_cb _hidl_cb) { - std::string cameraId, deviceVersion; - bool match = matchDeviceName(cameraDeviceName, &deviceVersion, &cameraId); - if (!match) { - _hidl_cb(Status::ILLEGAL_ARGUMENT, nullptr); - return Void(); - } - - std::string deviceName(cameraDeviceName.c_str()); - ssize_t index = mCameraDeviceNames.indexOf(std::make_pair(cameraId, deviceName)); - if (index == NAME_NOT_FOUND) { // Either an illegal name or a device version mismatch - Status status = Status::OK; - ssize_t idx = mCameraIds.indexOf(cameraId); - if (idx == NAME_NOT_FOUND) { - ALOGE("%s: cannot find camera %s!", __FUNCTION__, cameraId.c_str()); - status = Status::ILLEGAL_ARGUMENT; - } else { // invalid version - ALOGE("%s: camera device %s does not support version %s!", - __FUNCTION__, cameraId.c_str(), deviceVersion.c_str()); - status = Status::OPERATION_NOT_SUPPORTED; - } - _hidl_cb(status, nullptr); - return Void(); - } - - if (mCameraStatusMap.count(cameraId) == 0 || - mCameraStatusMap[cameraId] != CAMERA_DEVICE_STATUS_PRESENT) { - _hidl_cb(Status::ILLEGAL_ARGUMENT, nullptr); - return Void(); - } - - sp<android::hardware::camera::device::V3_2::implementation::CameraDevice> device = - new android::hardware::camera::device::V3_2::implementation::CameraDevice( - mModule, cameraId, mCameraDeviceNames); - - if (device == nullptr) { - ALOGE("%s: cannot allocate camera device for id %s", __FUNCTION__, cameraId.c_str()); - _hidl_cb(Status::INTERNAL_ERROR, nullptr); - return Void(); - } - - if (device->isInitFailed()) { - ALOGE("%s: camera device %s init failed!", __FUNCTION__, cameraId.c_str()); - device = nullptr; - _hidl_cb(Status::INTERNAL_ERROR, nullptr); - return Void(); - } - - _hidl_cb (Status::OK, device); + const hidl_string& cameraDeviceName __unused, getCameraDeviceInterface_V3_x_cb _hidl_cb) { + /* Not supported by HAL1 legacy devices */ + _hidl_cb(Status::OPERATION_NOT_SUPPORTED, nullptr); return Void(); } diff --git a/camera/provider/2.4-legacy/CameraProvider.h b/camera/provider/2.4-legacy/CameraProvider.h index 75971fa..706d5f4 100644 --- a/camera/provider/2.4-legacy/CameraProvider.h +++ b/camera/provider/2.4-legacy/CameraProvider.h @@ -93,7 +93,6 @@ private: // extract legacy camera ID/device version from a HIDL device name static std::string getLegacyCameraId(const hidl_string& deviceName); - static int getCameraDeviceVersion(const hidl_string& deviceName); // create HIDL device name from camera ID and device version static std::string getHidlDeviceName(std::string cameraId, int deviceVersion); |