| commit | ec31161c4886f7e714bec31a8dc6bca072d0de9c | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Sun Jun 21 23:14:06 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Jun 21 23:14:06 2020 +0000 |
| tree | 4a5bdce09ff77a1727732a22ae98b1a4d2290751 | |
| parent | 4fe55b9ab18c04831805f7e7a5c51d8c66672278 [diff] | |
| parent | 7e5c3f0240e3ced81a9addced90efcf1537ba666 [diff] |
Merge "Camera: Fix insensitive language in comments and names" into rvc-dev am: 7e5c3f0240 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11936022 Change-Id: Ie7223de56cc97de4cb6f6d358c8f2d448b44c257
diff --git a/camera/device/3.2/default/convert.cpp b/camera/device/3.2/default/convert.cpp index d878deb..06ad7e9 100644 --- a/camera/device/3.2/default/convert.cpp +++ b/camera/device/3.2/default/convert.cpp
@@ -38,7 +38,7 @@ } 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;
diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index f6860cf..3b8f833 100644 --- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
@@ -1894,7 +1894,7 @@ } // 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 @@ } } -// 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);