| commit | f7e3b8441dde8128b936f5aad25f193ecfe52848 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Jun 22 00:03:12 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 22 00:03:12 2020 +0000 |
| tree | 4a078dcd8457e2d4ad5f4e378bc494a38cdb5b1c | |
| parent | b5cd88ac0c46e4155510f458e6f9ec2a8bebb89d [diff] | |
| parent | 7e63b49db65a5f2736099971d31defe423607235 [diff] |
Merge "Camera: Fix insensitive language in comments and names" into rvc-dev am: 7e5c3f0240 am: 21bb36aead am: fad2482bda am: 7e63b49db6 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11936022 Change-Id: Iaa8e527b9126f0851118087a15b434b4f9e349fb
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);