Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Change-Id: Ie7223de56cc97de4cb6f6d358c8f2d448b44c257
This commit is contained in:
TreeHugger Robot
2020-06-21 23:14:06 +00:00
committed by Automerger Merge Worker
parent 4fe55b9ab1 7e5c3f0240
commit ec31161c48
2 changed files with 3 additions and 3 deletions
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);