diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-22 00:08:57 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-22 00:08:57 +0000 |
commit | 5ef9925b75a4ddc40633b645be1de85ed328a715 (patch) | |
tree | 02ec886ae6ff6afab773b36688995bc53e0430d6 | |
parent | 97fcfc7fec01aa740208d701232fe2f7f3557778 (diff) | |
parent | 297eaacfa6f8115127a68974cd4759b8b50afae1 (diff) | |
download | av-android14-qpr2-release.tar.gz |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25662753', 'googleplex-android-review.googlesource.com/25664040'] into 24Q1-release.android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-release
Change-Id: Icbe5bd9608758f512093be1c20bd27ee355e716e
-rw-r--r-- | camera/CameraMetadata.cpp | 2 | ||||
-rw-r--r-- | camera/VendorTagDescriptor.cpp | 2 | ||||
-rw-r--r-- | camera/include/camera/CameraMetadata.h | 2 | ||||
-rw-r--r-- | services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp | 2 | ||||
-rw-r--r-- | services/camera/libcameraservice/utils/SessionConfigurationUtils.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/camera/CameraMetadata.cpp b/camera/CameraMetadata.cpp index 2e808d1272..424923a27f 100644 --- a/camera/CameraMetadata.cpp +++ b/camera/CameraMetadata.cpp @@ -880,7 +880,7 @@ status_t CameraMetadata::getTagFromName(const char *name, return OK; } -metadata_vendor_id_t CameraMetadata::getVendorId() { +metadata_vendor_id_t CameraMetadata::getVendorId() const { return get_camera_metadata_vendor_id(mBuffer); } diff --git a/camera/VendorTagDescriptor.cpp b/camera/VendorTagDescriptor.cpp index fb26f838b9..c12a1a1c88 100644 --- a/camera/VendorTagDescriptor.cpp +++ b/camera/VendorTagDescriptor.cpp @@ -466,7 +466,7 @@ const char* VendorTagDescriptorCache::getTagName(uint32_t tag, int VendorTagDescriptorCache::getTagType(uint32_t tag, metadata_vendor_id_t id) const { - int ret = 0; + int ret = -1; auto desc = mVendorMap.find(id); if (desc != mVendorMap.end()) { ret = desc->second->getTagType(tag); diff --git a/camera/include/camera/CameraMetadata.h b/camera/include/camera/CameraMetadata.h index c56ee6da8b..2903dfbc0c 100644 --- a/camera/include/camera/CameraMetadata.h +++ b/camera/include/camera/CameraMetadata.h @@ -245,7 +245,7 @@ class CameraMetadata: public Parcelable { /** * Return the current vendor tag id associated with this metadata. */ - metadata_vendor_id_t getVendorId(); + metadata_vendor_id_t getVendorId() const; private: camera_metadata_t *mBuffer; diff --git a/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp b/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp index 3be8e15161..384f53e23d 100644 --- a/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp +++ b/services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp @@ -1133,7 +1133,7 @@ status_t mapRequestTemplateToAidl(camera_request_template_t templateId, } void filterParameters(const CameraMetadata& src, const CameraMetadata& deviceInfo, - int vendorTagId, CameraMetadata& dst) { + metadata_vendor_id_t vendorTagId, CameraMetadata& dst) { const CameraMetadata params(src); camera_metadata_ro_entry_t availableSessionKeys = deviceInfo.find( ANDROID_REQUEST_AVAILABLE_SESSION_KEYS); diff --git a/services/camera/libcameraservice/utils/SessionConfigurationUtils.h b/services/camera/libcameraservice/utils/SessionConfigurationUtils.h index 29e3eca9af..5b2ea5c06f 100644 --- a/services/camera/libcameraservice/utils/SessionConfigurationUtils.h +++ b/services/camera/libcameraservice/utils/SessionConfigurationUtils.h @@ -177,7 +177,7 @@ status_t mapRequestTemplateToAidl(camera_request_template_t templateId, 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; |