Fix VendorTagId to be metadata_vendor_id_t
- It is currently int. This was causing downstream issues
because the CameraMetadata object passed to
configureStreams had the wrong vendor_id, so we couldn't
call update() on it with vendor tags.
- As a drive by, specify getVendorId() as being const.
Without this, we need to keep copying const CameraMetadata
objects to simply get their vendor id.
Thanks epeev@ for all your pointers along the debugging
journey!
Bug: 316413287
Test: m
Change-Id: I32bf9bcb7137990d28b9fcbe1b27bc41ebbd50ee
diff --git a/services/camera/libcameraservice/utils/SessionConfigurationUtils.h b/services/camera/libcameraservice/utils/SessionConfigurationUtils.h
index 29e3eca..5b2ea5c 100644
--- a/services/camera/libcameraservice/utils/SessionConfigurationUtils.h
+++ b/services/camera/libcameraservice/utils/SessionConfigurationUtils.h
@@ -177,7 +177,7 @@
aidl::android::hardware::camera::device::RequestTemplate* tempId /*out*/);
void filterParameters(const CameraMetadata& src, const CameraMetadata& deviceInfo,
- int vendorTagId, CameraMetadata& dst);
+ metadata_vendor_id_t vendorTagId, CameraMetadata& dst);
constexpr int32_t MAX_SURFACES_PER_STREAM = 4;