summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Wasilczyk <twasilczyk@google.com>2023-09-14 16:38:04 +0000
committerTomasz Wasilczyk <twasilczyk@google.com>2023-09-14 16:39:18 +0000
commitd4dfc5840b3d46d6b47e3a3afa4b0403fc8969b3 (patch)
treeb0502a1035fa4bdac639c3154a95e04a48067bfc
parentaf12656753b8b6bf3df4c32df233c1b8c9556f85 (diff)
downloadcommon-d4dfc5840b3d46d6b47e3a3afa4b0403fc8969b3.tar.gz
Use String8/16 c_str [libhwc remainder]
Bug: 295394788 Test: make checkbuild Change-Id: I41761b16074869366231a435dda2ace14c6d8156
-rw-r--r--libhwc2.1/ExynosHWCDebug.h4
-rw-r--r--libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/libhwc2.1/ExynosHWCDebug.h b/libhwc2.1/ExynosHWCDebug.h
index 783a429..bd62a2e 100644
--- a/libhwc2.1/ExynosHWCDebug.h
+++ b/libhwc2.1/ExynosHWCDebug.h
@@ -76,8 +76,8 @@ int32_t saveErrorLog(const android::String8 &errString, ExynosDisplay *display =
if (hwcCheckDebugMessages(debugFlag) || CC_UNLIKELY(ATRACE_ENABLED())) { \
String8 log; \
log.appendFormat((fmt), ##__VA_ARGS__); \
- ALOGD("%s", log.string()); \
- if (CC_UNLIKELY(ATRACE_ENABLED())) ATRACE_NAME(log.string()); \
+ ALOGD("%s", log.c_str()); \
+ if (CC_UNLIKELY(ATRACE_ENABLED())) ATRACE_NAME(log.c_str()); \
}
#endif
diff --git a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp
index 3cb6358..84c1b97 100644
--- a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp
+++ b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp
@@ -2723,7 +2723,7 @@ int32_t ExynosDisplayDrmInterface::setDisplayHistogramChannelSetting(
int ret = NO_ERROR;
uint32_t blobId = 0;
- ATRACE_NAME(String8::format("%s #%u", __func__, channelId).string());
+ ATRACE_NAME(String8::format("%s #%u", __func__, channelId).c_str());
const DrmProperty &prop = mDrmCrtc->histogram_channel_property(channelId);
if (!prop.id()) {
@@ -2751,7 +2751,7 @@ int32_t ExynosDisplayDrmInterface::clearDisplayHistogramChannelSetting(
ExynosDisplayDrmInterface::DrmModeAtomicReq &drmReq, uint8_t channelId) {
int ret = NO_ERROR;
- ATRACE_NAME(String8::format("%s #%u", __func__, channelId).string());
+ ATRACE_NAME(String8::format("%s #%u", __func__, channelId).c_str());
const DrmProperty &prop = mDrmCrtc->histogram_channel_property(channelId);
if (!prop.id()) {