Use String8/16 c_str [media]
Bug: 295394788
Test: make checkbuild
Change-Id: I4ba5400f39c769bec59508525844f1daefe1d15c
diff --git a/services/mediaresourcemanager/ResourceManagerService.cpp b/services/mediaresourcemanager/ResourceManagerService.cpp
index f718406..9c81f89 100644
--- a/services/mediaresourcemanager/ResourceManagerService.cpp
+++ b/services/mediaresourcemanager/ResourceManagerService.cpp
@@ -164,7 +164,7 @@
static String8 getString(const std::vector<T>& items) {
String8 itemsStr;
for (size_t i = 0; i < items.size(); ++i) {
- itemsStr.appendFormat("%s ", toString(items[i]).string());
+ itemsStr.appendFormat("%s ", toString(items[i]).c_str());
}
return itemsStr;
}
@@ -272,7 +272,7 @@
"can't dump ResourceManagerService from pid=%d, uid=%d\n",
AIBinder_getCallingPid(),
AIBinder_getCallingUid());
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
return PERMISSION_DENIED;
}
@@ -325,7 +325,7 @@
const ResourceList& resources = info.resources;
result.append(" Resources:\n");
for (auto it = resources.begin(); it != resources.end(); it++) {
- snprintf(buffer, SIZE, " %s\n", toString(it->second).string());
+ snprintf(buffer, SIZE, " %s\n", toString(it->second).c_str());
result.append(buffer);
}
}
@@ -339,7 +339,7 @@
result.append(" Events logs (most recent at top):\n");
result.append(serviceLog);
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
return OK;
}
@@ -417,7 +417,7 @@
}
Status ResourceManagerService::config(const std::vector<MediaResourcePolicyParcel>& policies) {
- String8 log = String8::format("config(%s)", getString(policies).string());
+ String8 log = String8::format("config(%s)", getString(policies).c_str());
mServiceLog->add(log);
std::scoped_lock lock{mLock};
@@ -490,7 +490,7 @@
int64_t clientId = clientInfo.id;
const std::string& name = clientInfo.name;
String8 log = String8::format("addResource(pid %d, uid %d clientId %lld, resources %s)",
- pid, uid, (long long) clientId, getString(resources).string());
+ pid, uid, (long long) clientId, getString(resources).c_str());
mServiceLog->add(log);
std::scoped_lock lock{mLock};
@@ -552,7 +552,7 @@
int32_t uid = clientInfo.uid;
int64_t clientId = clientInfo.id;
String8 log = String8::format("removeResource(pid %d, uid %d clientId %lld, resources %s)",
- pid, uid, (long long) clientId, getString(resources).string());
+ pid, uid, (long long) clientId, getString(resources).c_str());
mServiceLog->add(log);
std::scoped_lock lock{mLock};
@@ -679,7 +679,7 @@
int32_t callingPid = clientInfo.pid;
std::string clientName = clientInfo.name;
String8 log = String8::format("reclaimResource(callingPid %d, uid %d resources %s)",
- callingPid, clientInfo.uid, getString(resources).string());
+ callingPid, clientInfo.uid, getString(resources).c_str());
mServiceLog->add(log);
*_aidl_return = false;
diff --git a/services/mediaresourcemanager/ResourceObserverService.cpp b/services/mediaresourcemanager/ResourceObserverService.cpp
index ebe3903..33525fd 100644
--- a/services/mediaresourcemanager/ResourceObserverService.cpp
+++ b/services/mediaresourcemanager/ResourceObserverService.cpp
@@ -122,7 +122,7 @@
"can't dump ResourceManagerService from pid=%d, uid=%d\n",
AIBinder_getCallingPid(),
AIBinder_getCallingUid());
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
return PERMISSION_DENIED;
}
@@ -150,7 +150,7 @@
}
}
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
return OK;
}
diff --git a/services/mediaresourcemanager/ServiceLog.cpp b/services/mediaresourcemanager/ServiceLog.cpp
index 791e797..132ed33 100644
--- a/services/mediaresourcemanager/ServiceLog.cpp
+++ b/services/mediaresourcemanager/ServiceLog.cpp
@@ -35,14 +35,14 @@
time_t now = time(0);
char buf[64];
strftime(buf, sizeof(buf), "%m-%d %T", localtime(&now));
- mLogs.add(String8::format("%s %s", buf, log.string()));
+ mLogs.add(String8::format("%s %s", buf, log.c_str()));
}
String8 ServiceLog::toString(const char *linePrefix) const {
Mutex::Autolock lock(mLock);
String8 result;
for (const auto& log : mLogs) {
- addLine(log.string(), linePrefix, &result);
+ addLine(log.c_str(), linePrefix, &result);
}
if (mLogs.size() == mMaxNum) {
addLine("...", linePrefix, &result);
diff --git a/services/mediaresourcemanager/test/ServiceLog_test.cpp b/services/mediaresourcemanager/test/ServiceLog_test.cpp
index 9172499..8556f2a 100644
--- a/services/mediaresourcemanager/test/ServiceLog_test.cpp
+++ b/services/mediaresourcemanager/test/ServiceLog_test.cpp
@@ -39,26 +39,26 @@
mServiceLog->add(String8("log1"));
logString = mServiceLog->toString();
EXPECT_TRUE(logString.contains("log1"));
- ALOGV("toString:\n%s", logString.string());
+ ALOGV("toString:\n%s", logString.c_str());
static const char kTestLogPrefix[] = "testlogprefix: ";
logString = mServiceLog->toString(kTestLogPrefix);
EXPECT_TRUE(logString.contains(kTestLogPrefix));
EXPECT_TRUE(logString.contains("log1"));
- ALOGV("toString:\n%s", logString.string());
+ ALOGV("toString:\n%s", logString.c_str());
mServiceLog->add(String8("log2"));
logString = mServiceLog->toString();
EXPECT_TRUE(logString.contains("log1"));
EXPECT_TRUE(logString.contains("log2"));
- ALOGV("toString:\n%s", logString.string());
+ ALOGV("toString:\n%s", logString.c_str());
mServiceLog->add(String8("log3"));
logString = mServiceLog->toString();
EXPECT_TRUE(logString.contains("log1"));
EXPECT_TRUE(logString.contains("log2"));
EXPECT_TRUE(logString.contains("log3"));
- ALOGV("toString:\n%s", logString.string());
+ ALOGV("toString:\n%s", logString.c_str());
mServiceLog->add(String8("log4"));
logString = mServiceLog->toString();
@@ -66,7 +66,7 @@
EXPECT_TRUE(logString.contains("log2"));
EXPECT_TRUE(logString.contains("log3"));
EXPECT_TRUE(logString.contains("log4"));
- ALOGV("toString:\n%s", logString.string());
+ ALOGV("toString:\n%s", logString.c_str());
mServiceLog->add(String8("log5"));
logString = mServiceLog->toString();
@@ -75,7 +75,7 @@
EXPECT_TRUE(logString.contains("log3"));
EXPECT_TRUE(logString.contains("log4"));
EXPECT_TRUE(logString.contains("log5"));
- ALOGV("toString:\n%s", logString.string());
+ ALOGV("toString:\n%s", logString.c_str());
}
} // namespace android