tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Camera: Fix insensitive language in comments and names" into rvc-dev am: 7e5c3f0240 am: 21bb36aead am: fad2482bda

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11936022

Change-Id: I69ac7de0fddde6e07d9764e123daf6f49f67f688
This commit is contained in:
TreeHugger Robot 2020-06-21 23:50:21 +00:00 committed by Automerger Merge Worker
commit 7e63b49db6
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
camera/device/3.2/default/convert.cpp
View file

@ -38,7 +38,7 @@ bool convertFromHidl(const CameraMetadata &src, const camera_metadata_t** dst) {
}
const uint8_t* data = src.data();
// sanity check the size of CameraMetadata match underlying camera_metadata_t
// check that the size of CameraMetadata match underlying camera_metadata_t
if (get_camera_metadata_size((camera_metadata_t*)data) != src.size()) {
ALOGE("%s: input CameraMetadata is corrupt!", __FUNCTION__);
return false;

4
camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
View file

@ -1894,7 +1894,7 @@ TEST_P(CameraHidlTest, getCameraDeviceInterface) {
}
// Verify that the device resource cost can be retrieved and the values are
// sane.
// correct.
TEST_P(CameraHidlTest, getResourceCost) {
hidl_vec<hidl_string> cameraDeviceNames = getCameraDeviceNames(mProvider);
@ -2544,7 +2544,7 @@ TEST_P(CameraHidlTest, sendCommandSmoothZoom) {
}
}
// Basic sanity tests related to camera parameters.
// Basic correctness tests related to camera parameters.
TEST_P(CameraHidlTest, getSetParameters) {
hidl_vec<hidl_string> cameraDeviceNames = getCameraDeviceNames(mProvider);