summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-09-21 22:07:08 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-09-21 22:07:08 +0000
commit151e02383591f7ae52399d4045739551a3ed5139 (patch)
treef6323bf960a219d860ed5782ff91e1c846add2d9
parent3098dbff844f818a245e6e2c5bbc3ae7e03a6c1b (diff)
parent91c956bfac6ca1a07500a6f01eee9f5a529b20f7 (diff)
downloadav-151e02383591f7ae52399d4045739551a3ed5139.tar.gz
Snap for 10843824 from 91c956bfac6ca1a07500a6f01eee9f5a529b20f7 to 24Q1-release
Change-Id: I9a6d77a6a24e4ea039f3a8cc7490ed461d90d435
-rw-r--r--media/eco/ECOSession.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/media/eco/ECOSession.cpp b/media/eco/ECOSession.cpp
index 1a2e910..e6eb2b0 100644
--- a/media/eco/ECOSession.cpp
+++ b/media/eco/ECOSession.cpp
@@ -381,7 +381,7 @@ Status ECOSession::addStatsProvider(
return STATUS_ERROR(ERROR_PERMISSION_DENIED, "Failed to get provider name");
}
- ECOLOGV("Try to add stats provider name: %s uid: %d pid %d", ::android::String8(name).string(),
+ ECOLOGV("Try to add stats provider name: %s uid: %d pid %d", ::android::String8(name).c_str(),
IPCThreadState::self()->getCallingUid(), IPCThreadState::self()->getCallingPid());
if (provider == nullptr) {
@@ -397,10 +397,10 @@ Status ECOSession::addStatsProvider(
mProvider->getName(&name);
String8 errorMsg = String8::format(
"ECOService 1.0 only supports one stats provider, current provider: %s",
- ::android::String8(name).string());
- ECOLOGE("%s", errorMsg.string());
+ ::android::String8(name).c_str());
+ ECOLOGE("%s", errorMsg.c_str());
*status = false;
- return STATUS_ERROR(ERROR_ALREADY_EXISTS, errorMsg.string());
+ return STATUS_ERROR(ERROR_ALREADY_EXISTS, errorMsg.c_str());
}
// TODO: Handle the provider config.
@@ -482,7 +482,7 @@ Status ECOSession::addInfoListener(
return STATUS_ERROR(ERROR_ILLEGAL_ARGUMENT, "listener config is not valid");
}
- ECOLOGD("Info listener name: %s uid: %d pid %d", ::android::String8(name).string(),
+ ECOLOGD("Info listener name: %s uid: %d pid %d", ::android::String8(name).c_str(),
IPCThreadState::self()->getCallingUid(), IPCThreadState::self()->getCallingPid());
mListener = listener;
@@ -556,10 +556,10 @@ status_t ECOSession::dump(int fd, const Vector<String16>& /*args*/) {
mWidth, mHeight, mIsCameraRecording, mTargetBitrateBps, mCodecType, mCodecProfile,
mCodecLevel);
if (mProvider != nullptr) {
- dprintf(fd, "Provider: %s \n", ::android::String8(mProviderName).string());
+ dprintf(fd, "Provider: %s \n", ::android::String8(mProviderName).c_str());
}
if (mListener != nullptr) {
- dprintf(fd, "Listener: %s \n", ::android::String8(mListenerName).string());
+ dprintf(fd, "Listener: %s \n", ::android::String8(mListenerName).c_str());
}
dprintf(fd, "\n===================\n\n");