commit 12b04a5ee10bedc874b20935ce807b8c1c1e7387
author Tomasz Wasilczyk <twasilczyk@google.com> Fri Aug 11 15:52:22 2023 +0000
committer Tomasz Wasilczyk <twasilczyk@google.com> Tue Aug 22 21:51:06 2023 -0700
tree bea2c50fde5734e817c1fac792fef66ea8f0958b
parent 30cab01682e863a5a6bbd777681a6a6d719b4e1a

Use String8/16 c_str [camera]

Bug: 295394788
Test: make checkbuild
Change-Id: I321053f5a82ca2e1ad9ea447f96e81a87c3fcfe0

camera/CameraMetadata.cpp

diff --git a/camera/CameraMetadata.cpp b/camera/CameraMetadata.cpp
index a4ae71b..2e808d1 100644
--- a/camera/CameraMetadata.cpp
+++ b/camera/CameraMetadata.cpp
@@ -289,7 +289,7 @@
         return res;
     }
     // string.size() doesn't count the null termination character.
-    return updateImpl(tag, (const void*)string.string(), string.size() + 1);
+    return updateImpl(tag, (const void*)string.c_str(), string.size() + 1);
 }
 
 status_t CameraMetadata::update(const camera_metadata_ro_entry &entry) {
@@ -809,7 +809,7 @@
     for (size_t i = 0; i < totalSectionCount; ++i) {
 
         const char *str = (i < ANDROID_SECTION_COUNT) ? camera_metadata_section_names[i] :
-                (*vendorSections)[i - ANDROID_SECTION_COUNT].string();
+                (*vendorSections)[i - ANDROID_SECTION_COUNT].c_str();
 
         ALOGV("%s: Trying to match against section '%s'", __FUNCTION__, str);