diff options
author | Shuzhen Wang <shuzhenwang@google.com> | 2018-09-05 09:40:00 -0700 |
---|---|---|
committer | Shuzhen Wang <shuzhenwang@google.com> | 2018-10-04 11:56:20 -0700 |
commit | 6bdeaf55bf5cb7d313628d0ff092413c42b5782c (patch) | |
tree | de9cc1958f6cbf6050dfd8af50bb9fbb51ea10ff /camera/device/3.5/default/CameraDevice.cpp | |
parent | c9816c691fdee653c1773fec8a40cef1fcc1c8af (diff) |
VTS: Add test for device version 3.5
Also includes:
- Add test for getPhysicalCameraCharacteristics.
- Doc update for the new HIDL API.
- Tighten boundary check for camera ID in CameraModule.
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalCameraProviderV2_4Target -l INFO
Bug: 79523700
Bug: 115969176
Bug: 116512585
Change-Id: I051d1b0c91834781a1f8d893ed5ebfa579b03774
Diffstat (limited to 'camera/device/3.5/default/CameraDevice.cpp')
-rw-r--r-- | camera/device/3.5/default/CameraDevice.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/camera/device/3.5/default/CameraDevice.cpp b/camera/device/3.5/default/CameraDevice.cpp index c5d6c576d8..a6969af54a 100644 --- a/camera/device/3.5/default/CameraDevice.cpp +++ b/camera/device/3.5/default/CameraDevice.cpp @@ -79,6 +79,10 @@ Return<void> CameraDevice::getPhysicalCameraCharacteristics(const hidl_string& p int ret = mModule->getPhysicalCameraInfo((int)id, &physicalInfo); if (ret == OK) { V3_2::implementation::convertToHidl(physicalInfo, &cameraCharacteristics); + } else if (ret == -EINVAL) { + ALOGE("%s: %s is not a valid physical camera Id outside of getCameraIdList()", + __FUNCTION__, physicalCameraId.c_str()); + status = Status::ILLEGAL_ARGUMENT; } else { ALOGE("%s: Failed to get physical camera %s info: %s (%d)!", __FUNCTION__, physicalCameraId.c_str(), strerror(-ret), ret); |