Use String8/16 c_str [camera]
Bug: 295394788
Test: make checkbuild
Change-Id: I321053f5a82ca2e1ad9ea447f96e81a87c3fcfe0
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 764296e..28bb781 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -1068,7 +1068,7 @@
/*targetSdkVersion*/ __ANDROID_API_FUTURE__, /*overrideToPortrait*/ true,
/*forceSlowJpegMode*/false, /*out*/ tmp)
).isOk()) {
- ALOGE("%s: Error initializing shim metadata: %s", __FUNCTION__, ret.toString8().string());
+ ALOGE("%s: Error initializing shim metadata: %s", __FUNCTION__, ret.toString8().c_str());
}
return ret;
}
diff --git a/services/camera/libcameraservice/api1/Camera2Client.cpp b/services/camera/libcameraservice/api1/Camera2Client.cpp
index 68c28e9..9dead7f 100644
--- a/services/camera/libcameraservice/api1/Camera2Client.cpp
+++ b/services/camera/libcameraservice/api1/Camera2Client.cpp
@@ -162,7 +162,7 @@
SharedParameters::Lock l(mParameters);
ALOGD("%s: Default parameters converted from camera %d:", __FUNCTION__,
mCameraId);
- ALOGD("%s", l.mParameters.paramsFlattened.string());
+ ALOGD("%s", l.mParameters.paramsFlattened.c_str());
}
return OK;
@@ -221,7 +221,7 @@
result << fmt::sprintf(" GPS timestamp: %" PRId64 "\n",
p.gpsTimestamp);
result << fmt::sprintf(" GPS processing method: %s\n",
- p.gpsProcessingMethod.string());
+ p.gpsProcessingMethod.c_str());
}
result << " White balance mode: ";
diff --git a/services/camera/libcameraservice/api1/client2/Parameters.cpp b/services/camera/libcameraservice/api1/client2/Parameters.cpp
index 23570c2..d5ea689 100644
--- a/services/camera/libcameraservice/api1/client2/Parameters.cpp
+++ b/services/camera/libcameraservice/api1/client2/Parameters.cpp
@@ -163,7 +163,7 @@
availablePreviewSizes[i].width,
availablePreviewSizes[i].height);
}
- ALOGV("Supported preview sizes are: %s", supportedPreviewSizes.string());
+ ALOGV("Supported preview sizes are: %s", supportedPreviewSizes.c_str());
params.set(CameraParameters::KEY_SUPPORTED_PREVIEW_SIZES,
supportedPreviewSizes);
@@ -174,7 +174,7 @@
availableVideoSizes[i].width,
availableVideoSizes[i].height);
}
- ALOGV("Supported video sizes are: %s", supportedVideoSizes.string());
+ ALOGV("Supported video sizes are: %s", supportedVideoSizes.c_str());
params.set(CameraParameters::KEY_SUPPORTED_VIDEO_SIZES,
supportedVideoSizes);
}
@@ -314,7 +314,7 @@
fps);
ALOGV("%s: Supported preview frame rates: %s",
- __FUNCTION__, supportedPreviewFrameRates.string());
+ __FUNCTION__, supportedPreviewFrameRates.c_str());
}
params.set(CameraParameters::KEY_SUPPORTED_PREVIEW_FRAME_RATES,
supportedPreviewFrameRates);
@@ -2831,7 +2831,7 @@
String8 areasStr(areasCStr);
ssize_t areaStart = areasStr.find("(", 0) + 1;
while (areaStart != 0) {
- const char* area = areasStr.string() + areaStart;
+ const char* area = areasStr.c_str() + areaStart;
char *numEnd;
int vals[NUM_FIELDS];
for (size_t i = 0; i < NUM_FIELDS; i++) {
diff --git a/services/camera/libcameraservice/gui/RingBufferConsumer.cpp b/services/camera/libcameraservice/gui/RingBufferConsumer.cpp
index cd4a92c..5dbfb36 100644
--- a/services/camera/libcameraservice/gui/RingBufferConsumer.cpp
+++ b/services/camera/libcameraservice/gui/RingBufferConsumer.cpp
@@ -25,11 +25,11 @@
#include <gui/RingBufferConsumer.h>
#include <camera/StringUtils.h>
-#define BI_LOGV(x, ...) ALOGV("[%s] " x, mName.string(), ##__VA_ARGS__)
-#define BI_LOGD(x, ...) ALOGD("[%s] " x, mName.string(), ##__VA_ARGS__)
-#define BI_LOGI(x, ...) ALOGI("[%s] " x, mName.string(), ##__VA_ARGS__)
-#define BI_LOGW(x, ...) ALOGW("[%s] " x, mName.string(), ##__VA_ARGS__)
-#define BI_LOGE(x, ...) ALOGE("[%s] " x, mName.string(), ##__VA_ARGS__)
+#define BI_LOGV(x, ...) ALOGV("[%s] " x, mName.c_str(), ##__VA_ARGS__)
+#define BI_LOGD(x, ...) ALOGD("[%s] " x, mName.c_str(), ##__VA_ARGS__)
+#define BI_LOGI(x, ...) ALOGI("[%s] " x, mName.c_str(), ##__VA_ARGS__)
+#define BI_LOGW(x, ...) ALOGW("[%s] " x, mName.c_str(), ##__VA_ARGS__)
+#define BI_LOGE(x, ...) ALOGE("[%s] " x, mName.c_str(), ##__VA_ARGS__)
#undef assert
#define assert(x) ALOG_ASSERT((x), #x)
diff --git a/services/camera/libcameraservice/hidl/HidlCameraService.cpp b/services/camera/libcameraservice/hidl/HidlCameraService.cpp
index 0c0fa7a..90ba294 100644
--- a/services/camera/libcameraservice/hidl/HidlCameraService.cpp
+++ b/services/camera/libcameraservice/hidl/HidlCameraService.cpp
@@ -77,7 +77,7 @@
break;
default:
ALOGE("Get camera characteristics from camera service failed: %s",
- serviceRet.toString8().string());
+ serviceRet.toString8().c_str());
status = B2HStatus(serviceRet);
}
_hidl_cb(status, hidlMetadata);
@@ -306,7 +306,7 @@
}
hVendorTagSections.resize(numSections);
for (size_t s = 0; s < numSections; s++) {
- hVendorTagSections[s].sectionName = (*sectionNames)[s].string();
+ hVendorTagSections[s].sectionName = (*sectionNames)[s].c_str();
hVendorTagSections[s].tags = tagsBySection[s];
}
HProviderIdAndVendorTagSections &hProviderIdAndVendorTagSections =