commit 6c37df00ae8cd027aa4c228f9f73cebd41cc9998
author Jayant Chowdhary <jchowdhary@google.com> Mon Mar 11 20:12:14 2024 +0000
committer Jayant Chowdhary <jchowdhary@google.com> Tue Mar 12 17:25:45 2024 +0000
tree 44af1a7ec5315fd475955e8e730c41e42e863d1f
parent 65e6c6037c13f9b3d25e44137d65ddd1bec9ed3b

Reland "camera ndk: Add ACameraMetadata_getTagFromName to the ndk"

This reverts commit 45a66e86a3dbf788e1b4748656c4734bd03e4e72.

Bug: 327254006

Take2: build failures on branches with PLATFORM_VERSION < 15 shouldn't
       exist after aosp/2999516 is submitted

Test: build

Change-Id: Ib190b17d601ddcc7fb39943b230ce9569c274ea8
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>

camera/ndk/impl/ACameraMetadata.h

diff --git a/camera/ndk/impl/ACameraMetadata.h b/camera/ndk/impl/ACameraMetadata.h
index 084a60b..e89e620 100644
--- a/camera/ndk/impl/ACameraMetadata.h
+++ b/camera/ndk/impl/ACameraMetadata.h
@@ -27,9 +27,17 @@
 
 #ifdef __ANDROID_VNDK__
 #include <CameraMetadata.h>
+#include <aidl/android/frameworks/cameraservice/common/VendorTag.h>
+#include <aidl/android/frameworks/cameraservice/common/VendorTagSection.h>
+#include <aidl/android/frameworks/cameraservice/common/ProviderIdAndVendorTagSections.h>
+#include <VendorTagDescriptor.h>
 using CameraMetadata = android::hardware::camera::common::V1_0::helper::CameraMetadata;
+using ::aidl::android::frameworks::cameraservice::common::ProviderIdAndVendorTagSections;
+using ::android::hardware::camera::common::V1_0::helper::VendorTagDescriptor;
+using ::android::hardware::camera::common::V1_0::helper::VendorTagDescriptorCache;
 #else
 #include <camera/CameraMetadata.h>
+#include <camera/VendorTagDescriptor.h>
 #endif
 
 #include <camera/NdkCameraMetadata.h>
@@ -73,6 +81,8 @@
 
     camera_status_t getTags(/*out*/int32_t* numTags,
                             /*out*/const uint32_t** tags) const;
+    camera_status_t
+    getTagFromName(const char *name, uint32_t *tag) const;
 
     const CameraMetadata& getInternalData() const;
     bool isLogicalMultiCamera(size_t* count, const char* const** physicalCameraIds) const;
@@ -134,6 +144,7 @@
 
     std::vector<const char*> mStaticPhysicalCameraIds;
     std::vector<String8> mStaticPhysicalCameraIdValues;
+    sp<VendorTagDescriptor> mVTags = nullptr;
 };
 
 #endif // _ACAMERA_METADATA_H