Use String8/16 c_str [media]
Bug: 295394788
Test: make checkbuild
Change-Id: I4ba5400f39c769bec59508525844f1daefe1d15c
diff --git a/cmds/screenrecord/TextRenderer.cpp b/cmds/screenrecord/TextRenderer.cpp
index 01f73e0..cd27bb5 100644
--- a/cmds/screenrecord/TextRenderer.cpp
+++ b/cmds/screenrecord/TextRenderer.cpp
@@ -153,7 +153,7 @@
// just convert to char* -- but String8 doesn't document what it does
// with values outside 0-255. So just convert to char* and use strlen()
// to see what we get.
- const char* str = str8.string();
+ const char* str = str8.c_str();
return computeScaledStringWidth(str, strlen(str));
}
@@ -180,13 +180,13 @@
void TextRenderer::drawString(const Program& program, const float* texMatrix,
float x, float y, const String8& str8) const {
- ALOGV("drawString %.3f,%.3f '%s' (scale=%.3f)", x, y, str8.string(),mScale);
+ ALOGV("drawString %.3f,%.3f '%s' (scale=%.3f)", x, y, str8.c_str(),mScale);
initOnce();
// We want to draw the entire string with a single GLES call. We
// generate two arrays, one with screen coordinates, one with texture
// coordinates. Need two triangles per character.
- const char* str = str8.string();
+ const char* str = str8.c_str();
size_t len = strlen(str); // again, unsure about String8 handling
const size_t quadCoords =
@@ -252,7 +252,7 @@
float TextRenderer::drawWrappedString(const Program& texRender,
float xpos, float ypos, const String8& str) {
- ALOGV("drawWrappedString %.3f,%.3f '%s'", xpos, ypos, str.string());
+ ALOGV("drawWrappedString %.3f,%.3f '%s'", xpos, ypos, str.c_str());
initOnce();
if (mScreenWidth == 0 || mScreenHeight == 0) {
@@ -283,7 +283,7 @@
} else {
// We need to break the string into pieces, ideally at whitespace
// boundaries.
- char* mangle = strdup(str.string());
+ char* mangle = strdup(str.c_str());
char* start = mangle;
while (start != NULL) {
float xposAdj = (start == mangle) ? xpos : xpos + indentWidth;
diff --git a/cmds/screenrecord/screenrecord.cpp b/cmds/screenrecord/screenrecord.cpp
index d866c18..6fe19f0 100644
--- a/cmds/screenrecord/screenrecord.cpp
+++ b/cmds/screenrecord/screenrecord.cpp
@@ -989,7 +989,7 @@
"-a",
"android.intent.action.MEDIA_SCANNER_SCAN_FILE",
"-d",
- fileUrl.string(),
+ fileUrl.c_str(),
NULL
};
if (gVerbose) {
diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp
index 379f244..2b1f453 100644
--- a/cmds/stagefright/stagefright.cpp
+++ b/cmds/stagefright/stagefright.cpp
@@ -155,7 +155,7 @@
}
static void dumpSource(const sp<MediaSource> &source, const String8 &filename) {
- FILE *out = fopen(filename.string(), "wb");
+ FILE *out = fopen(filename.c_str(), "wb");
CHECK_EQ((status_t)OK, source->start());
@@ -538,9 +538,9 @@
Vector<sp<MediaSource> > &sources, bool syncInfoPresent) {
#if 0
sp<MPEG4Writer> writer =
- new MPEG4Writer(gWriteMP4Filename.string());
+ new MPEG4Writer(gWriteMP4Filename.c_str());
#else
- int fd = open(gWriteMP4Filename.string(), O_CREAT | O_LARGEFILE | O_TRUNC | O_RDWR, S_IRUSR | S_IWUSR);
+ int fd = open(gWriteMP4Filename.c_str(), O_CREAT | O_LARGEFILE | O_TRUNC | O_RDWR, S_IRUSR | S_IWUSR);
if (fd < 0) {
fprintf(stderr, "couldn't open file");
return;
diff --git a/drm/common/DrmSupportInfo.cpp b/drm/common/DrmSupportInfo.cpp
index 584c6a6..6294f50 100644
--- a/drm/common/DrmSupportInfo.cpp
+++ b/drm/common/DrmSupportInfo.cpp
@@ -50,7 +50,7 @@
for (size_t i = 0; i < mMimeTypeVector.size(); i++) {
const String8 item = mMimeTypeVector.itemAt(i);
- if (!strcasecmp(item.string(), mimeType.string())) {
+ if (!strcasecmp(item.c_str(), mimeType.c_str())) {
return true;
}
}
@@ -61,7 +61,7 @@
for (size_t i = 0; i < mFileSuffixVector.size(); i++) {
const String8 item = mFileSuffixVector.itemAt(i);
- if (!strcasecmp(item.string(), fileType.string())) {
+ if (!strcasecmp(item.c_str(), fileType.c_str())) {
return true;
}
}
diff --git a/drm/common/IDrmManagerService.cpp b/drm/common/IDrmManagerService.cpp
index a6d33b0..1b49be1 100644
--- a/drm/common/IDrmManagerService.cpp
+++ b/drm/common/IDrmManagerService.cpp
@@ -303,8 +303,8 @@
const String8 value = drmInforequest->get(key);
if (key == String8("FileDescriptorKey")) {
int fd = -1;
- if (sscanf(value.string(), "FileDescriptor[%d]", &fd) != 1) {
- sscanf(value.string(), "%d", &fd);
+ if (sscanf(value.c_str(), "FileDescriptor[%d]", &fd) != 1) {
+ sscanf(value.c_str(), "%d", &fd);
}
data.writeFileDescriptor(fd);
} else {
@@ -1330,7 +1330,7 @@
const String8 mime = data.readString8();
sp<DecryptHandle> handle
- = openDecryptSession(uniqueId, fd, offset, length, mime.string());
+ = openDecryptSession(uniqueId, fd, offset, length, mime.c_str());
if (NULL != handle.get()) {
writeDecryptHandleToParcelData(handle.get(), reply);
@@ -1349,7 +1349,7 @@
const String8 uri = data.readString8();
const String8 mime = data.readString8();
- sp<DecryptHandle> handle = openDecryptSession(uniqueId, uri.string(), mime.string());
+ sp<DecryptHandle> handle = openDecryptSession(uniqueId, uri.c_str(), mime.c_str());
if (NULL != handle.get()) {
writeDecryptHandleToParcelData(handle.get(), reply);
diff --git a/drm/common/ReadWriteUtils.cpp b/drm/common/ReadWriteUtils.cpp
index 16b5b34..97c3716 100644
--- a/drm/common/ReadWriteUtils.cpp
+++ b/drm/common/ReadWriteUtils.cpp
@@ -34,7 +34,7 @@
String8 ReadWriteUtils::readBytes(const String8& filePath) {
FILE* file = NULL;
- file = fopen(filePath.string(), "r");
+ file = fopen(filePath.c_str(), "r");
String8 string("");
if (NULL != file) {
@@ -56,7 +56,7 @@
int ReadWriteUtils::readBytes(const String8& filePath, char** buffer) {
FILE* file = NULL;
- file = fopen(filePath.string(), "r");
+ file = fopen(filePath.c_str(), "r");
off64_t length = 0;
if (NULL != file) {
@@ -77,15 +77,15 @@
void ReadWriteUtils::writeToFile(const String8& filePath, const String8& data) {
FILE* file = NULL;
- file = fopen(filePath.string(), "w+");
+ file = fopen(filePath.c_str(), "w+");
if (NULL != file) {
int fd = fileno(file);
int size = data.size();
if (FAILURE != ftruncate(fd, size)) {
- if (size != write(fd, data.string(), size)) {
- ALOGE("Failed to write the data to: %s", filePath.string());
+ if (size != write(fd, data.c_str(), size)) {
+ ALOGE("Failed to write the data to: %s", filePath.c_str());
}
}
fclose(file);
@@ -94,14 +94,14 @@
void ReadWriteUtils::appendToFile(const String8& filePath, const String8& data) {
FILE* file = NULL;
- file = fopen(filePath.string(), "a+");
+ file = fopen(filePath.c_str(), "a+");
if (NULL != file) {
int fd = fileno(file);
int size = data.size();
- if (size != write(fd, data.string(), size)) {
- ALOGE("Failed to write the data to: %s", filePath.string());
+ if (size != write(fd, data.c_str(), size)) {
+ ALOGE("Failed to write the data to: %s", filePath.c_str());
}
fclose(file);
}
diff --git a/drm/drmserver/DrmManagerService.cpp b/drm/drmserver/DrmManagerService.cpp
index c830c6e..98eba2a 100644
--- a/drm/drmserver/DrmManagerService.cpp
+++ b/drm/drmserver/DrmManagerService.cpp
@@ -373,7 +373,7 @@
(void)args;
#endif
}
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
return NO_ERROR;
}
diff --git a/drm/drmserver/PlugInManager.h b/drm/drmserver/PlugInManager.h
index 466844d..df40476 100644
--- a/drm/drmserver/PlugInManager.h
+++ b/drm/drmserver/PlugInManager.h
@@ -137,7 +137,7 @@
PlugInContainer* pPlugInContainer = new PlugInContainer();
- pPlugInContainer->hHandle = dlopen(rsPlugInPath.string(), RTLD_LAZY);
+ pPlugInContainer->hHandle = dlopen(rsPlugInPath.c_str(), RTLD_LAZY);
if (NULL == pPlugInContainer->hHandle) {
delete pPlugInContainer;
@@ -201,7 +201,7 @@
*/
Vector<String8> getPlugInPathList(const String8& rsDirPath) {
Vector<String8> fileList;
- DIR* pDir = opendir(rsDirPath.string());
+ DIR* pDir = opendir(rsDirPath.c_str());
struct dirent* pEntry;
while (NULL != pDir && NULL != (pEntry = readdir(pDir))) {
diff --git a/drm/libdrmframework/plugins/common/util/src/MimeTypeUtil.cpp b/drm/libdrmframework/plugins/common/util/src/MimeTypeUtil.cpp
index 3b1566f..d47a9d9 100644
--- a/drm/libdrmframework/plugins/common/util/src/MimeTypeUtil.cpp
+++ b/drm/libdrmframework/plugins/common/util/src/MimeTypeUtil.cpp
@@ -128,7 +128,7 @@
struct MimeGroup* pGroup;
struct MimeTypeList* pMimeItem;
int len;
- pMimeType = mimeType.string();
+ pMimeType = mimeType.c_str();
if (NULL != pMimeType) {
if ((0 == strncmp(pMimeType, mime_group_audio, (sizeof mime_group_audio) - 1)) ||
(0 == strncmp(pMimeType, mime_group_video, (sizeof mime_group_video) - 1))) {
@@ -159,7 +159,7 @@
result = String8(mime_type_unsupported);
}
LOG_DEBUG("convertMimeType got mimetype %s, converted into mimetype %s",
- pMimeType, result.string());
+ pMimeType, result.c_str());
}
return result;
}
diff --git a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
index 769de0c..1d8c724 100644
--- a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
+++ b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
@@ -544,7 +544,7 @@
String8 uriTag = String8(uri);
uriTag.toLower();
- if (0 == strncmp(uriTag.string(), fileTag, sizeof(fileTag) - 1)) {
+ if (0 == strncmp(uriTag.c_str(), fileTag, sizeof(fileTag) - 1)) {
const char *filePath = strchr(uri + sizeof(fileTag) - 1, '/');
if (NULL != filePath && onCanHandle(uniqueId, String8(filePath))) {
int fd = open(filePath, O_RDONLY);
diff --git a/drm/libdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp b/drm/libdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp
index 0fa3478..44b4438 100644
--- a/drm/libdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp
+++ b/drm/libdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp
@@ -64,7 +64,7 @@
String8 value("dummy_available_time");
char* charValue = NULL;
charValue = new char[value.length() + 1];
- strncpy(charValue, value.string(), value.length());
+ strncpy(charValue, value.c_str(), value.length());
charValue[value.length()] = '\0';
//Just add dummy available time for verification
@@ -95,7 +95,7 @@
const int bufferSize = licenseString.size();
char* data = NULL;
data = new char[bufferSize];
- memcpy(data, licenseString.string(), bufferSize);
+ memcpy(data, licenseString.c_str(), bufferSize);
const DrmBuffer* buffer = new DrmBuffer(data, bufferSize);
drmInfoStatus = new DrmInfoStatus(DrmInfoStatus::STATUS_OK,
DrmInfoRequest::TYPE_RIGHTS_ACQUISITION_INFO, buffer, drmInfo->getMimeType());
@@ -150,7 +150,7 @@
int length = dataString.length();
char* data = NULL;
data = new char[length];
- memcpy(data, dataString.string(), length);
+ memcpy(data, dataString.c_str(), length);
drmInfo = new DrmInfo(drmInfoRequest->getInfoType(),
DrmBuffer(data, length), drmInfoRequest->getMimeType());
}
@@ -158,7 +158,7 @@
}
bool DrmPassthruPlugIn::onCanHandle(int /*uniqueId*/, const String8& path) {
- ALOGV("DrmPassthruPlugIn::canHandle: %s ", path.string());
+ ALOGV("DrmPassthruPlugIn::canHandle: %s ", path.c_str());
String8 extension = path.getPathExtension();
extension.toLower();
return (String8(".passthru") == extension);
diff --git a/drm/libmediadrm/DrmHalAidl.cpp b/drm/libmediadrm/DrmHalAidl.cpp
index 5ec7337..9e30708 100644
--- a/drm/libmediadrm/DrmHalAidl.cpp
+++ b/drm/libmediadrm/DrmHalAidl.cpp
@@ -117,7 +117,7 @@
}
static std::string toStdString(const String8& string8) {
- return std::string(string8.string());
+ return std::string(string8.c_str());
}
static std::vector<KeyValue> toKeyValueVector(const KeyedVector<String8, String8>& keyedVector) {
@@ -415,7 +415,7 @@
*isSupported = false;
Uuid uuidAidl = DrmUtils::toAidlUuid(uuid);
SecurityLevel levelAidl = toAidlSecurityLevel(level);
- std::string mimeTypeStr = mimeType.string();
+ std::string mimeTypeStr = mimeType.c_str();
for (ssize_t i = mFactories.size() - 1; i >= 0; i--) {
CryptoSchemes schemes{};
diff --git a/drm/libmediadrm/DrmHalHidl.cpp b/drm/libmediadrm/DrmHalHidl.cpp
index 6106aa7..29dde96 100644
--- a/drm/libmediadrm/DrmHalHidl.cpp
+++ b/drm/libmediadrm/DrmHalHidl.cpp
@@ -121,7 +121,7 @@
}
static hidl_string toHidlString(const String8& string) {
- return hidl_string(string.string());
+ return hidl_string(string.c_str());
}
static DrmPlugin::SecurityLevel toSecurityLevel(SecurityLevel level) {
@@ -353,7 +353,7 @@
sp<IDrmPlugin> plugin;
Return<void> hResult = factory->createPlugin(
- uuid, appPackageName.string(), [&](Status status, const sp<IDrmPlugin>& hPlugin) {
+ uuid, appPackageName.c_str(), [&](Status status, const sp<IDrmPlugin>& hPlugin) {
if (status != Status::OK) {
DrmUtils::LOG2BE(uuid, "Failed to make drm plugin: %d", status);
return;
@@ -517,7 +517,7 @@
return DrmStatus(OK);
}
// isCryptoSchemeSupported(uuid, mimeType)
- auto hResult = factory->isContentTypeSupported(mimeType.string());
+ auto hResult = factory->isContentTypeSupported(mimeType.c_str());
if (!hResult.isOk()) {
return DrmStatus(DEAD_OBJECT);
}
@@ -531,7 +531,7 @@
if (factoryV1_2 == NULL) {
return DrmStatus(ERROR_UNSUPPORTED);
} else {
- auto hResult = factoryV1_2->isCryptoSchemeSupported_1_2(uuid, mimeType.string(),
+ auto hResult = factoryV1_2->isCryptoSchemeSupported_1_2(uuid, mimeType.c_str(),
toHidlSecurityLevel(level));
if (!hResult.isOk()) {
return DrmStatus(DEAD_OBJECT);
diff --git a/drm/libmediadrm/DrmMetricsLogger.cpp b/drm/libmediadrm/DrmMetricsLogger.cpp
index ce4d730..7d600cb 100644
--- a/drm/libmediadrm/DrmMetricsLogger.cpp
+++ b/drm/libmediadrm/DrmMetricsLogger.cpp
@@ -151,7 +151,7 @@
if (status == OK) {
String8 version8;
if (getPropertyString(String8("version"), version8) == OK) {
- mVersion = version8.string();
+ mVersion = version8.c_str();
}
reportMediaDrmCreated();
} else {
diff --git a/drm/libmediadrm/DrmSessionManager.cpp b/drm/libmediadrm/DrmSessionManager.cpp
index 6744e25..989a597 100644
--- a/drm/libmediadrm/DrmSessionManager.cpp
+++ b/drm/libmediadrm/DrmSessionManager.cpp
@@ -172,7 +172,7 @@
const std::shared_ptr<IResourceManagerClient>& drm, const Vector<uint8_t> &sessionId) {
uid_t uid = AIBinder_getCallingUid();
ALOGV("addSession(pid %d, uid %d, drm %p, sessionId %s)", pid, uid, drm.get(),
- GetSessionIdString(sessionId).string());
+ GetSessionIdString(sessionId).c_str());
Mutex::Autolock lock(mLock);
if (mService == NULL) {
@@ -188,7 +188,7 @@
}
void DrmSessionManager::useSession(const Vector<uint8_t> &sessionId) {
- ALOGV("useSession(%s)", GetSessionIdString(sessionId).string());
+ ALOGV("useSession(%s)", GetSessionIdString(sessionId).c_str());
Mutex::Autolock lock(mLock);
auto it = mSessionMap.find(toStdVec(sessionId));
@@ -205,7 +205,7 @@
}
void DrmSessionManager::removeSession(const Vector<uint8_t> &sessionId) {
- ALOGV("removeSession(%s)", GetSessionIdString(sessionId).string());
+ ALOGV("removeSession(%s)", GetSessionIdString(sessionId).c_str());
Mutex::Autolock lock(mLock);
auto it = mSessionMap.find(toStdVec(sessionId));
diff --git a/drm/libmediadrm/SharedLibrary.cpp b/drm/libmediadrm/SharedLibrary.cpp
index b2d635d..97d5653 100644
--- a/drm/libmediadrm/SharedLibrary.cpp
+++ b/drm/libmediadrm/SharedLibrary.cpp
@@ -25,7 +25,7 @@
namespace android {
SharedLibrary::SharedLibrary(const String8 &path) {
- mLibHandle = dlopen(path.string(), RTLD_NOW);
+ mLibHandle = dlopen(path.c_str(), RTLD_NOW);
}
SharedLibrary::~SharedLibrary() {
diff --git a/drm/mediacas/plugins/clearkey/ClearKeyCasPlugin.cpp b/drm/mediacas/plugins/clearkey/ClearKeyCasPlugin.cpp
index af7c367..37051d5 100644
--- a/drm/mediacas/plugins/clearkey/ClearKeyCasPlugin.cpp
+++ b/drm/mediacas/plugins/clearkey/ClearKeyCasPlugin.cpp
@@ -157,7 +157,7 @@
}
status_t ClearKeyCasPlugin::closeSession(const CasSessionId &sessionId) {
- ALOGV("closeSession: sessionId=%s", sessionIdToString(sessionId).string());
+ ALOGV("closeSession: sessionId=%s", sessionIdToString(sessionId).c_str());
std::shared_ptr<ClearKeyCasSession> session =
ClearKeySessionLibrary::get()->findSession(sessionId);
if (session.get() == nullptr) {
@@ -171,7 +171,7 @@
status_t ClearKeyCasPlugin::setSessionPrivateData(
const CasSessionId &sessionId, const CasData & /*data*/) {
ALOGV("setSessionPrivateData: sessionId=%s",
- sessionIdToString(sessionId).string());
+ sessionIdToString(sessionId).c_str());
std::shared_ptr<ClearKeyCasSession> session =
ClearKeySessionLibrary::get()->findSession(sessionId);
if (session.get() == nullptr) {
@@ -182,7 +182,7 @@
status_t ClearKeyCasPlugin::processEcm(
const CasSessionId &sessionId, const CasEcm& ecm) {
- ALOGV("processEcm: sessionId=%s", sessionIdToString(sessionId).string());
+ ALOGV("processEcm: sessionId=%s", sessionIdToString(sessionId).c_str());
std::shared_ptr<ClearKeyCasSession> session =
ClearKeySessionLibrary::get()->findSession(sessionId);
if (session.get() == nullptr) {
@@ -220,7 +220,7 @@
const CasSessionId &sessionId, int32_t event,
int arg, const CasData &eventData) {
ALOGV("sendSessionEvent: sessionId=%s, event=%d, arg=%d",
- sessionIdToString(sessionId).string(), event, arg);
+ sessionIdToString(sessionId).c_str(), event, arg);
// Echo the received event to the callback.
// Clear key plugin doesn't use any event, echo'ing for testing only.
if (mCallbackExt != NULL) {
@@ -232,12 +232,12 @@
}
status_t ClearKeyCasPlugin::provision(const String8 &str) {
- ALOGV("provision: provisionString=%s", str.string());
+ ALOGV("provision: provisionString=%s", str.c_str());
Mutex::Autolock lock(mKeyFetcherLock);
std::unique_ptr<ClearKeyLicenseFetcher> license_fetcher;
license_fetcher.reset(new ClearKeyLicenseFetcher());
- status_t err = license_fetcher->Init(str.string());
+ status_t err = license_fetcher->Init(str.c_str());
if (err != OK) {
ALOGE("provision: failed to init ClearKeyLicenseFetcher (err=%d)", err);
return err;
@@ -475,7 +475,7 @@
status_t ClearKeyDescramblerPlugin::setMediaCasSession(
const CasSessionId &sessionId) {
- ALOGV("setMediaCasSession: sessionId=%s", sessionIdToString(sessionId).string());
+ ALOGV("setMediaCasSession: sessionId=%s", sessionIdToString(sessionId).c_str());
std::shared_ptr<ClearKeyCasSession> session =
ClearKeySessionLibrary::get()->findSession(sessionId);
@@ -503,7 +503,7 @@
ALOGV("descramble: secure=%d, sctrl=%d, subSamples=%s, "
"srcPtr=%p, dstPtr=%p, srcOffset=%d, dstOffset=%d",
(int)secure, (int)scramblingControl,
- subSamplesToString(subSamples, numSubSamples).string(),
+ subSamplesToString(subSamples, numSubSamples).c_str(),
srcPtr, dstPtr, srcOffset, dstOffset);
std::shared_ptr<ClearKeyCasSession> session = std::atomic_load(&mCASSession);
diff --git a/drm/mediacas/plugins/clearkey/JsonAssetLoader.cpp b/drm/mediacas/plugins/clearkey/JsonAssetLoader.cpp
index ee8dba3..ad015bf 100644
--- a/drm/mediacas/plugins/clearkey/JsonAssetLoader.cpp
+++ b/drm/mediacas/plugins/clearkey/JsonAssetLoader.cpp
@@ -80,7 +80,7 @@
}
}
- return decodeBase64(AString(paddedText.string()));
+ return decodeBase64(AString(paddedText.c_str()));
}
bool JsonAssetLoader::findKey(const String8& jsonObject, Asset *asset) {
@@ -91,30 +91,30 @@
return false;
}
findValue(kIdTag, &value);
- ALOGV("found %s=%s", kIdTag.string(), value.string());
- asset->set_id(atoi(value.string()));
+ ALOGV("found %s=%s", kIdTag.c_str(), value.c_str());
+ asset->set_id(atoi(value.c_str()));
if (jsonObject.find(kNameTag) < 0) {
return false;
}
findValue(kNameTag, &value);
- ALOGV("found %s=%s", kNameTag.string(), value.string());
- asset->set_name(value.string());
+ ALOGV("found %s=%s", kNameTag.c_str(), value.c_str());
+ asset->set_name(value.c_str());
if (jsonObject.find(kLowerCaseOgranizationNameTag) < 0) {
return false;
}
findValue(kLowerCaseOgranizationNameTag, &value);
- ALOGV("found %s=%s", kLowerCaseOgranizationNameTag.string(), value.string());
- asset->set_lowercase_organization_name(value.string());
+ ALOGV("found %s=%s", kLowerCaseOgranizationNameTag.c_str(), value.c_str());
+ asset->set_lowercase_organization_name(value.c_str());
if (jsonObject.find(kCasTypeTag) < 0) {
return false;
}
findValue(kCasTypeTag, &value);
- ALOGV("found %s=%s", kCasTypeTag.string(), value.string());
+ ALOGV("found %s=%s", kCasTypeTag.c_str(), value.c_str());
// Asset_CasType_CLEARKEY_CAS = 1
- asset->set_cas_type((Asset_CasType)atoi(value.string()));
+ asset->set_cas_type((Asset_CasType)atoi(value.c_str()));
return true;
}
@@ -127,7 +127,7 @@
if (0 == (*nextToken).compare(key)) {
if (nextToken + 1 == mTokens.end())
break;
- valueToken = (*(nextToken + 1)).string();
+ valueToken = (*(nextToken + 1)).c_str();
value->setTo(valueToken);
nextToken++;
break;
@@ -146,7 +146,7 @@
jsmn_init(&parser);
int numTokens = jsmn_parse(&parser,
- jsonObject.string(), jsonObject.size(), NULL, 0);
+ jsonObject.c_str(), jsonObject.size(), NULL, 0);
if (numTokens < 0) {
ALOGE("Parser returns error code=%d", numTokens);
return false;
@@ -157,7 +157,7 @@
mJsmnTokens.setCapacity(jsmnTokensSize);
jsmn_init(&parser);
- int status = jsmn_parse(&parser, jsonObject.string(),
+ int status = jsmn_parse(&parser, jsonObject.c_str(),
jsonObject.size(), mJsmnTokens.editArray(), numTokens);
if (status < 0) {
ALOGE("Parser returns error code=%d", status);
@@ -169,12 +169,12 @@
const char *pjs;
ALOGV("numTokens: %d", numTokens);
for (int j = 0; j < numTokens; ++j) {
- pjs = jsonObject.string() + mJsmnTokens[j].start;
+ pjs = jsonObject.c_str() + mJsmnTokens[j].start;
if (mJsmnTokens[j].type == JSMN_STRING ||
mJsmnTokens[j].type == JSMN_PRIMITIVE) {
token.setTo(pjs, mJsmnTokens[j].end - mJsmnTokens[j].start);
tokens->add(token);
- ALOGV("add token: %s", token.string());
+ ALOGV("add token: %s", token.c_str());
}
}
return true;
@@ -199,7 +199,7 @@
// the original string.
jsmn_init(&parser);
int numTokens = jsmn_parse(&parser,
- jsonAsset.string(), jsonAsset.size(), NULL, 0);
+ jsonAsset.c_str(), jsonAsset.size(), NULL, 0);
if (numTokens < 0) {
ALOGE("Parser returns error code=%d", numTokens);
return false;
@@ -209,7 +209,7 @@
mJsmnTokens.setCapacity(jsmnTokensSize);
jsmn_init(&parser);
- int status = jsmn_parse(&parser, jsonAsset.string(),
+ int status = jsmn_parse(&parser, jsonAsset.c_str(),
jsonAsset.size(), mJsmnTokens.editArray(), numTokens);
if (status < 0) {
ALOGE("Parser returns error code=%d", status);
@@ -219,7 +219,7 @@
String8 token;
const char *pjs;
for (int i = 0; i < numTokens; ++i) {
- pjs = jsonAsset.string() + mJsmnTokens[i].start;
+ pjs = jsonAsset.c_str() + mJsmnTokens[i].start;
if (mJsmnTokens[i].type == JSMN_OBJECT) {
token.setTo(pjs, mJsmnTokens[i].end - mJsmnTokens[i].start);
jsonObjects->add(token);
diff --git a/drm/mediacas/plugins/mock/MockCasPlugin.cpp b/drm/mediacas/plugins/mock/MockCasPlugin.cpp
index f8bab0a..671fba1 100644
--- a/drm/mediacas/plugins/mock/MockCasPlugin.cpp
+++ b/drm/mediacas/plugins/mock/MockCasPlugin.cpp
@@ -135,7 +135,7 @@
}
status_t MockCasPlugin::closeSession(const CasSessionId &sessionId) {
- ALOGV("closeSession: sessionId=%s", arrayToString(sessionId).string());
+ ALOGV("closeSession: sessionId=%s", arrayToString(sessionId).c_str());
Mutex::Autolock lock(mLock);
sp<MockCasSession> session =
@@ -151,7 +151,7 @@
status_t MockCasPlugin::setSessionPrivateData(
const CasSessionId &sessionId, const CasData& /*data*/) {
ALOGV("setSessionPrivateData: sessionId=%s",
- arrayToString(sessionId).string());
+ arrayToString(sessionId).c_str());
Mutex::Autolock lock(mLock);
sp<MockCasSession> session =
@@ -164,7 +164,7 @@
status_t MockCasPlugin::processEcm(
const CasSessionId &sessionId, const CasEcm& ecm) {
- ALOGV("processEcm: sessionId=%s", arrayToString(sessionId).string());
+ ALOGV("processEcm: sessionId=%s", arrayToString(sessionId).c_str());
Mutex::Autolock lock(mLock);
sp<MockCasSession> session =
@@ -173,7 +173,7 @@
return BAD_VALUE;
}
ALOGV("ECM: size=%zu", ecm.size());
- ALOGV("ECM: data=%s", arrayToString(ecm).string());
+ ALOGV("ECM: data=%s", arrayToString(ecm).c_str());
return OK;
}
@@ -183,7 +183,7 @@
Mutex::Autolock lock(mLock);
ALOGV("EMM: size=%zu", emm.size());
- ALOGV("EMM: data=%s", arrayToString(emm).string());
+ ALOGV("EMM: data=%s", arrayToString(emm).c_str());
return OK;
}
@@ -200,14 +200,14 @@
const CasSessionId &sessionId, int32_t event,
int /*arg*/, const CasData& /*eventData*/) {
ALOGV("sendSessionEvent: sessionId=%s, event=%d",
- arrayToString(sessionId).string(), event);
+ arrayToString(sessionId).c_str(), event);
Mutex::Autolock lock(mLock);
return OK;
}
status_t MockCasPlugin::provision(const String8 &str) {
- ALOGV("provision: provisionString=%s", str.string());
+ ALOGV("provision: provisionString=%s", str.c_str());
Mutex::Autolock lock(mLock);
return OK;
@@ -215,7 +215,7 @@
status_t MockCasPlugin::refreshEntitlements(
int32_t /*refreshType*/, const CasData &refreshData) {
- ALOGV("refreshEntitlements: refreshData=%s", arrayToString(refreshData).string());
+ ALOGV("refreshEntitlements: refreshData=%s", arrayToString(refreshData).c_str());
Mutex::Autolock lock(mLock);
return OK;
@@ -256,7 +256,7 @@
ALOGV("MockDescramblerPlugin::descramble(secure=%d, sctrl=%d,"
"subSamples=%s, srcPtr=%p, dstPtr=%p, srcOffset=%d, dstOffset=%d)",
(int)secure, (int)scramblingControl,
- subSamplesToString(subSamples, numSubSamples).string(),
+ subSamplesToString(subSamples, numSubSamples).c_str(),
srcPtr, dstPtr, srcOffset, dstOffset);
return 0;
diff --git a/drm/mediadrm/plugins/clearkey/default/DrmPlugin.cpp b/drm/mediadrm/plugins/clearkey/default/DrmPlugin.cpp
index 089eb1c..7ee8d3d 100644
--- a/drm/mediadrm/plugins/clearkey/default/DrmPlugin.cpp
+++ b/drm/mediadrm/plugins/clearkey/default/DrmPlugin.cpp
@@ -142,7 +142,7 @@
const String8& name, Vector<uint8_t>& value) const {
ssize_t index = mByteArrayProperties.indexOfKey(name);
if (index < 0) {
- ALOGE("App requested unknown property: %s", name.string());
+ ALOGE("App requested unknown property: %s", name.c_str());
return android::ERROR_DRM_CANNOT_HANDLE;
}
value = mByteArrayProperties.valueAt(index);
@@ -154,12 +154,12 @@
{
UNUSED(value);
if (0 == name.compare(kDeviceIdKey)) {
- ALOGD("Cannot set immutable property: %s", name.string());
+ ALOGD("Cannot set immutable property: %s", name.c_str());
return android::ERROR_DRM_CANNOT_HANDLE;
}
// Setting of undefined properties is not supported
- ALOGE("Failed to set property byte array, key=%s", name.string());
+ ALOGE("Failed to set property byte array, key=%s", name.c_str());
return android::ERROR_DRM_CANNOT_HANDLE;
}
@@ -167,7 +167,7 @@
const String8& name, String8& value) const {
ssize_t index = mStringProperties.indexOfKey(name);
if (index < 0) {
- ALOGE("App requested unknown property: %s", name.string());
+ ALOGE("App requested unknown property: %s", name.c_str());
return android::ERROR_DRM_CANNOT_HANDLE;
}
value = mStringProperties.valueAt(index);
@@ -178,21 +178,21 @@
const String8& name, const String8& value) {
String8 immutableKeys;
immutableKeys.appendFormat("%s,%s,%s,%s",
- kAlgorithmsKey.string(), kPluginDescriptionKey.string(),
- kVendorKey.string(), kVersionKey.string());
- if (immutableKeys.contains(name.string())) {
- ALOGD("Cannot set immutable property: %s", name.string());
+ kAlgorithmsKey.c_str(), kPluginDescriptionKey.c_str(),
+ kVendorKey.c_str(), kVersionKey.c_str());
+ if (immutableKeys.contains(name.c_str())) {
+ ALOGD("Cannot set immutable property: %s", name.c_str());
return android::ERROR_DRM_CANNOT_HANDLE;
}
ssize_t index = mStringProperties.indexOfKey(name);
if (index < 0) {
- ALOGE("Cannot set undefined property string, key=%s", name.string());
+ ALOGE("Cannot set undefined property string, key=%s", name.c_str());
return android::ERROR_DRM_CANNOT_HANDLE;
}
if (mStringProperties.add(name, value) < 0) {
- ALOGE("Failed to set property string, key=%s", name.string());
+ ALOGE("Failed to set property string, key=%s", name.c_str());
return android::ERROR_DRM_UNKNOWN;
}
return android::OK;
diff --git a/drm/mediadrm/plugins/clearkey/default/InitDataParser.cpp b/drm/mediadrm/plugins/clearkey/default/InitDataParser.cpp
index 121a4e2..ca697a2 100644
--- a/drm/mediadrm/plugins/clearkey/default/InitDataParser.cpp
+++ b/drm/mediadrm/plugins/clearkey/default/InitDataParser.cpp
@@ -69,7 +69,7 @@
String8 requestJson = generateRequest(keyIds);
licenseRequest->clear();
licenseRequest->appendArray(
- reinterpret_cast<const uint8_t*>(requestJson.string()),
+ reinterpret_cast<const uint8_t*>(requestJson.c_str()),
requestJson.size());
return android::OK;
}
diff --git a/drm/mediadrm/plugins/clearkey/default/JsonWebKey.cpp b/drm/mediadrm/plugins/clearkey/default/JsonWebKey.cpp
index a2d506d..6f87f9d 100644
--- a/drm/mediadrm/plugins/clearkey/default/JsonWebKey.cpp
+++ b/drm/mediadrm/plugins/clearkey/default/JsonWebKey.cpp
@@ -83,12 +83,12 @@
}
if (!decodeBase64String(encodedKeyId, &decodedKeyId)) {
- ALOGE("Failed to decode key id(%s)", encodedKeyId.string());
+ ALOGE("Failed to decode key id(%s)", encodedKeyId.c_str());
continue;
}
if (!decodeBase64String(encodedKey, &decodedKey)) {
- ALOGE("Failed to decode key(%s)", encodedKey.string());
+ ALOGE("Failed to decode key(%s)", encodedKey.c_str());
continue;
}
@@ -119,7 +119,7 @@
}
android::sp<ABuffer> buffer =
- android::decodeBase64(AString(paddedText.string()));
+ android::decodeBase64(AString(paddedText.c_str()));
if (buffer == NULL) {
ALOGE("Malformed base64 encoded content found.");
return false;
@@ -159,7 +159,7 @@
if (0 == (*nextToken).compare(key)) {
if (nextToken + 1 == mTokens.end())
break;
- valueToken = (*(nextToken + 1)).string();
+ valueToken = (*(nextToken + 1)).c_str();
value->setTo(valueToken);
nextToken++;
break;
@@ -186,7 +186,7 @@
jsmn_init(&parser);
int numTokens = jsmn_parse(&parser,
- jsonObject.string(), jsonObject.size(), NULL, 0);
+ jsonObject.c_str(), jsonObject.size(), NULL, 0);
if (numTokens < 0) {
ALOGE("Parser returns error code=%d", numTokens);
return false;
@@ -197,7 +197,7 @@
mJsmnTokens.setCapacity(jsmnTokensSize);
jsmn_init(&parser);
- int status = jsmn_parse(&parser, jsonObject.string(),
+ int status = jsmn_parse(&parser, jsonObject.c_str(),
jsonObject.size(), mJsmnTokens.editArray(), numTokens);
if (status < 0) {
ALOGE("Parser returns error code=%d", status);
@@ -208,7 +208,7 @@
String8 token;
const char *pjs;
for (int j = 0; j < numTokens; ++j) {
- pjs = jsonObject.string() + mJsmnTokens[j].start;
+ pjs = jsonObject.c_str() + mJsmnTokens[j].start;
if (mJsmnTokens[j].type == JSMN_STRING ||
mJsmnTokens[j].type == JSMN_PRIMITIVE) {
token.setTo(pjs, mJsmnTokens[j].end - mJsmnTokens[j].start);
@@ -237,7 +237,7 @@
// the original string.
jsmn_init(&parser);
int numTokens = jsmn_parse(&parser,
- jsonWebKeySet.string(), jsonWebKeySet.size(), NULL, 0);
+ jsonWebKeySet.c_str(), jsonWebKeySet.size(), NULL, 0);
if (numTokens < 0) {
ALOGE("Parser returns error code=%d", numTokens);
return false;
@@ -247,7 +247,7 @@
mJsmnTokens.setCapacity(jsmnTokensSize);
jsmn_init(&parser);
- int status = jsmn_parse(&parser, jsonWebKeySet.string(),
+ int status = jsmn_parse(&parser, jsonWebKeySet.c_str(),
jsonWebKeySet.size(), mJsmnTokens.editArray(), numTokens);
if (status < 0) {
ALOGE("Parser returns error code=%d", status);
@@ -257,7 +257,7 @@
String8 token;
const char *pjs;
for (int i = 0; i < numTokens; ++i) {
- pjs = jsonWebKeySet.string() + mJsmnTokens[i].start;
+ pjs = jsonWebKeySet.c_str() + mJsmnTokens[i].start;
if (mJsmnTokens[i].type == JSMN_OBJECT) {
token.setTo(pjs, mJsmnTokens[i].end - mJsmnTokens[i].start);
jsonObjects->add(token);
diff --git a/drm/mediadrm/plugins/clearkey/default/SessionLibrary.cpp b/drm/mediadrm/plugins/clearkey/default/SessionLibrary.cpp
index 529230e..058f8ce 100644
--- a/drm/mediadrm/plugins/clearkey/default/SessionLibrary.cpp
+++ b/drm/mediadrm/plugins/clearkey/default/SessionLibrary.cpp
@@ -50,7 +50,7 @@
mNextSessionId += 1;
Vector<uint8_t> sessionId;
sessionId.appendArray(
- reinterpret_cast<const uint8_t*>(sessionIdString.string()),
+ reinterpret_cast<const uint8_t*>(sessionIdString.c_str()),
sessionIdString.size());
mSessions.add(sessionId, new Session(sessionId));
diff --git a/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp b/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
index 3b4145f..db98a80 100644
--- a/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
+++ b/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
@@ -91,14 +91,14 @@
}
mSessions.add(sessionId);
- ALOGD("MockDrmPlugin::openSession() -> %s", vectorToString(sessionId).string());
+ ALOGD("MockDrmPlugin::openSession() -> %s", vectorToString(sessionId).c_str());
return OK;
}
status_t MockDrmPlugin::closeSession(Vector<uint8_t> const &sessionId)
{
Mutex::Autolock lock(mLock);
- ALOGD("MockDrmPlugin::closeSession(%s)", vectorToString(sessionId).string());
+ ALOGD("MockDrmPlugin::closeSession(%s)", vectorToString(sessionId).c_str());
ssize_t index = findSession(sessionId);
if (index == kNotFound) {
ALOGD("Invalid sessionId");
@@ -119,8 +119,8 @@
Mutex::Autolock lock(mLock);
ALOGD("MockDrmPlugin::getKeyRequest(sessionId=%s, initData=%s, mimeType=%s"
", keyType=%d, optionalParameters=%s))",
- vectorToString(sessionId).string(), vectorToString(initData).string(), mimeType.string(),
- keyType, stringMapToString(optionalParameters).string());
+ vectorToString(sessionId).c_str(), vectorToString(initData).c_str(), mimeType.c_str(),
+ keyType, stringMapToString(optionalParameters).c_str());
ssize_t index = findSession(sessionId);
if (index == kNotFound) {
@@ -144,8 +144,8 @@
String8 params;
for (size_t i = 0; i < optionalParameters.size(); i++) {
params.appendFormat("%s{%s,%s}", i ? "," : "",
- optionalParameters.keyAt(i).string(),
- optionalParameters.valueAt(i).string());
+ optionalParameters.keyAt(i).c_str(),
+ optionalParameters.valueAt(i).c_str());
}
mStringProperties.add(String8("mock-optparams"), params);
@@ -176,7 +176,7 @@
return BAD_VALUE;
} else {
*keyRequestType = static_cast<KeyRequestType>(
- atoi(mStringProperties.valueAt(index).string()));
+ atoi(mStringProperties.valueAt(index).c_str()));
}
return OK;
@@ -188,7 +188,7 @@
{
Mutex::Autolock lock(mLock);
ALOGD("MockDrmPlugin::provideKeyResponse(sessionId=%s, response=%s)",
- vectorToString(sessionId).string(), vectorToString(response).string());
+ vectorToString(sessionId).c_str(), vectorToString(response).c_str());
ssize_t index = findSession(sessionId);
if (index == kNotFound) {
ALOGD("Invalid sessionId");
@@ -217,7 +217,7 @@
{
Mutex::Autolock lock(mLock);
ALOGD("MockDrmPlugin::removeKeys(keySetId=%s)",
- vectorToString(keySetId).string());
+ vectorToString(keySetId).c_str());
ssize_t index = findKeySet(keySetId);
if (index == kNotFound) {
@@ -234,8 +234,8 @@
{
Mutex::Autolock lock(mLock);
ALOGD("MockDrmPlugin::restoreKeys(sessionId=%s, keySetId=%s)",
- vectorToString(sessionId).string(),
- vectorToString(keySetId).string());
+ vectorToString(sessionId).c_str(),
+ vectorToString(keySetId).c_str());
ssize_t index = findSession(sessionId);
if (index == kNotFound) {
ALOGD("Invalid sessionId");
@@ -255,7 +255,7 @@
KeyedVector<String8, String8> &infoMap) const
{
ALOGD("MockDrmPlugin::queryKeyStatus(sessionId=%s)",
- vectorToString(sessionId).string());
+ vectorToString(sessionId).c_str());
ssize_t index = findSession(sessionId);
if (index == kNotFound) {
@@ -304,7 +304,7 @@
{
Mutex::Autolock lock(mLock);
ALOGD("MockDrmPlugin::provideProvisionResponse(%s)",
- vectorToString(response).string());
+ vectorToString(response).c_str());
// Properties used in mock test, set by mock plugin and verifed cts test app
// byte[] response -> mock-response
@@ -367,7 +367,7 @@
{
Mutex::Autolock lock(mLock);
ALOGD("MockDrmPlugin::releaseSecureStops(%s)",
- vectorToString(ssRelease).string());
+ vectorToString(ssRelease).c_str());
// Properties used in mock test, set by mock plugin and verifed cts test app
// byte[] secure-stop-release -> mock-ssrelease
@@ -385,10 +385,10 @@
status_t MockDrmPlugin::getPropertyString(String8 const &name, String8 &value) const
{
- ALOGD("MockDrmPlugin::getPropertyString(name=%s)", name.string());
+ ALOGD("MockDrmPlugin::getPropertyString(name=%s)", name.c_str());
ssize_t index = mStringProperties.indexOfKey(name);
if (index < 0) {
- ALOGD("no property for '%s'", name.string());
+ ALOGD("no property for '%s'", name.c_str());
return BAD_VALUE;
}
value = mStringProperties.valueAt(index);
@@ -398,10 +398,10 @@
status_t MockDrmPlugin::getPropertyByteArray(String8 const &name,
Vector<uint8_t> &value) const
{
- ALOGD("MockDrmPlugin::getPropertyByteArray(name=%s)", name.string());
+ ALOGD("MockDrmPlugin::getPropertyByteArray(name=%s)", name.c_str());
ssize_t index = mByteArrayProperties.indexOfKey(name);
if (index < 0) {
- ALOGD("no property for '%s'", name.string());
+ ALOGD("no property for '%s'", name.c_str());
return BAD_VALUE;
}
value = mByteArrayProperties.valueAt(index);
@@ -413,11 +413,11 @@
{
Mutex::Autolock lock(mLock);
ALOGD("MockDrmPlugin::setPropertyString(name=%s, value=%s)",
- name.string(), value.string());
+ name.c_str(), value.c_str());
if (name == "mock-send-event") {
unsigned code, extra;
- sscanf(value.string(), "%d %d", &code, &extra);
+ sscanf(value.c_str(), "%d %d", &code, &extra);
DrmPlugin::EventType eventType = (DrmPlugin::EventType)code;
Vector<uint8_t> const *pSessionId = NULL;
@@ -438,7 +438,7 @@
sendEvent(eventType, extra, pSessionId, pData);
} else if (name == "mock-send-expiration-update") {
int64_t expiryTimeMS;
- sscanf(value.string(), "%jd", &expiryTimeMS);
+ sscanf(value.c_str(), "%jd", &expiryTimeMS);
Vector<uint8_t> const *pSessionId = NULL;
ssize_t index = mByteArrayProperties.indexOfKey(String8("mock-event-session-id"));
@@ -504,7 +504,7 @@
{
Mutex::Autolock lock(mLock);
ALOGD("MockDrmPlugin::setPropertyByteArray(name=%s, value=%s)",
- name.string(), vectorToString(value).string());
+ name.c_str(), vectorToString(value).c_str());
mByteArrayProperties.add(name, value);
return OK;
}
@@ -515,7 +515,7 @@
Mutex::Autolock lock(mLock);
ALOGD("MockDrmPlugin::setCipherAlgorithm(sessionId=%s, algorithm=%s)",
- vectorToString(sessionId).string(), algorithm.string());
+ vectorToString(sessionId).c_str(), algorithm.c_str());
ssize_t index = findSession(sessionId);
if (index == kNotFound) {
@@ -535,7 +535,7 @@
Mutex::Autolock lock(mLock);
ALOGD("MockDrmPlugin::setMacAlgorithm(sessionId=%s, algorithm=%s)",
- vectorToString(sessionId).string(), algorithm.string());
+ vectorToString(sessionId).c_str(), algorithm.c_str());
ssize_t index = findSession(sessionId);
if (index == kNotFound) {
@@ -557,10 +557,10 @@
{
Mutex::Autolock lock(mLock);
ALOGD("MockDrmPlugin::encrypt(sessionId=%s, keyId=%s, input=%s, iv=%s)",
- vectorToString(sessionId).string(),
- vectorToString(keyId).string(),
- vectorToString(input).string(),
- vectorToString(iv).string());
+ vectorToString(sessionId).c_str(),
+ vectorToString(keyId).c_str(),
+ vectorToString(input).c_str(),
+ vectorToString(iv).c_str());
ssize_t index = findSession(sessionId);
if (index == kNotFound) {
@@ -596,10 +596,10 @@
{
Mutex::Autolock lock(mLock);
ALOGD("MockDrmPlugin::decrypt(sessionId=%s, keyId=%s, input=%s, iv=%s)",
- vectorToString(sessionId).string(),
- vectorToString(keyId).string(),
- vectorToString(input).string(),
- vectorToString(iv).string());
+ vectorToString(sessionId).c_str(),
+ vectorToString(keyId).c_str(),
+ vectorToString(input).c_str(),
+ vectorToString(iv).c_str());
ssize_t index = findSession(sessionId);
if (index == kNotFound) {
@@ -634,9 +634,9 @@
{
Mutex::Autolock lock(mLock);
ALOGD("MockDrmPlugin::sign(sessionId=%s, keyId=%s, message=%s)",
- vectorToString(sessionId).string(),
- vectorToString(keyId).string(),
- vectorToString(message).string());
+ vectorToString(sessionId).c_str(),
+ vectorToString(keyId).c_str(),
+ vectorToString(message).c_str());
ssize_t index = findSession(sessionId);
if (index == kNotFound) {
@@ -670,10 +670,10 @@
{
Mutex::Autolock lock(mLock);
ALOGD("MockDrmPlugin::verify(sessionId=%s, keyId=%s, message=%s, signature=%s)",
- vectorToString(sessionId).string(),
- vectorToString(keyId).string(),
- vectorToString(message).string(),
- vectorToString(signature).string());
+ vectorToString(sessionId).c_str(),
+ vectorToString(keyId).c_str(),
+ vectorToString(message).c_str(),
+ vectorToString(signature).c_str());
ssize_t index = findSession(sessionId);
if (index == kNotFound) {
@@ -696,7 +696,7 @@
ALOGD("Missing 'mock-request' parameter for mock");
return BAD_VALUE;
} else {
- match = atol(mStringProperties.valueAt(index).string());
+ match = atol(mStringProperties.valueAt(index).c_str());
}
return OK;
}
@@ -710,11 +710,11 @@
Mutex::Autolock lock(mLock);
ALOGD("MockDrmPlugin::signRSA(sessionId=%s, algorithm=%s, keyId=%s, "
"message=%s, signature=%s)",
- vectorToString(sessionId).string(),
- algorithm.string(),
- vectorToString(message).string(),
- vectorToString(wrappedKey).string(),
- vectorToString(signature).string());
+ vectorToString(sessionId).c_str(),
+ algorithm.c_str(),
+ vectorToString(message).c_str(),
+ vectorToString(wrappedKey).c_str(),
+ vectorToString(signature).c_str());
// Properties used in mock test, set by mock plugin and verifed cts test app
// byte[] wrappedKey -> mock-wrappedkey
@@ -772,7 +772,7 @@
String8 result("{ ");
for (size_t i = 0; i < map.size(); i++) {
result.appendFormat("%s{name=%s, value=%s}", i > 0 ? ", " : "",
- map.keyAt(i).string(), map.valueAt(i).string());
+ map.keyAt(i).c_str(), map.valueAt(i).c_str());
}
return result + " }";
}
@@ -802,10 +802,10 @@
"pattern:{encryptBlocks=%d, skipBlocks=%d} src=%p, "
"subSamples=%s, dst=%p)",
(int)secure,
- arrayToString(key, DECRYPT_KEY_SIZE).string(),
- arrayToString(iv, DECRYPT_KEY_SIZE).string(),
+ arrayToString(key, DECRYPT_KEY_SIZE).c_str(),
+ arrayToString(iv, DECRYPT_KEY_SIZE).c_str(),
(int)mode, pattern.mEncryptBlocks, pattern.mSkipBlocks, srcPtr,
- subSamplesToString(subSamples, numSubSamples).string(),
+ subSamplesToString(subSamples, numSubSamples).c_str(),
dstPtr);
return OK;
}
diff --git a/media/libdatasource/DataSourceFactory.cpp b/media/libdatasource/DataSourceFactory.cpp
index f91e3ea..81a6cd0 100644
--- a/media/libdatasource/DataSourceFactory.cpp
+++ b/media/libdatasource/DataSourceFactory.cpp
@@ -92,7 +92,7 @@
source = NuCachedSource2::Create(
mediaHTTP,
- cacheConfig.isEmpty() ? NULL : cacheConfig.string(),
+ cacheConfig.isEmpty() ? NULL : cacheConfig.c_str(),
disconnectAtHighwatermark);
} else if (!strncasecmp("data:", uri, 5)) {
source = DataURISource::Create(uri);
diff --git a/media/libdatasource/NuCachedSource2.cpp b/media/libdatasource/NuCachedSource2.cpp
index 6d63ffb..4e71d5f 100644
--- a/media/libdatasource/NuCachedSource2.cpp
+++ b/media/libdatasource/NuCachedSource2.cpp
@@ -225,7 +225,7 @@
// IMediaHTTPConnection::readAt and therefore call back into JAVA.
mLooper->start(false /* runOnCallingThread */, true /* canCallJava */);
- mName = String8::format("NuCachedSource2(%s)", mSource->toString().string());
+ mName = String8::format("NuCachedSource2(%s)", mSource->toString().c_str());
}
NuCachedSource2::~NuCachedSource2() {
@@ -765,7 +765,7 @@
headers->removeItemsAt(index);
- ALOGV("Using special cache config '%s'", cacheConfig->string());
+ ALOGV("Using special cache config '%s'", cacheConfig->c_str());
}
if ((index = headers->indexOfKey(
diff --git a/media/libmedia/IMediaExtractor.cpp b/media/libmedia/IMediaExtractor.cpp
index eb436d1..499569b 100644
--- a/media/libmedia/IMediaExtractor.cpp
+++ b/media/libmedia/IMediaExtractor.cpp
@@ -304,7 +304,7 @@
}
for (size_t i = 0; i < tracks.size(); i++) {
const String8 desc = trackDescriptions.itemAt(i);
- str.appendFormat(" track {%s} ", desc.string());
+ str.appendFormat(" track {%s} ", desc.c_str());
wp<IMediaSource> wSource = tracks.itemAt(i);
if (wSource == NULL) {
str.append(": null\n");
@@ -386,7 +386,7 @@
}
}
}
- write(fd, out.string(), out.size());
+ write(fd, out.c_str(), out.size());
return OK;
}
diff --git a/media/libmedia/IMediaHTTPConnection.cpp b/media/libmedia/IMediaHTTPConnection.cpp
index 8cbb4c2..b029b97 100644
--- a/media/libmedia/IMediaHTTPConnection.cpp
+++ b/media/libmedia/IMediaHTTPConnection.cpp
@@ -54,8 +54,8 @@
tmp = String16("");
if (headers != NULL) {
for (size_t i = 0; i < headers->size(); ++i) {
- String16 key(headers->keyAt(i).string());
- String16 val(headers->valueAt(i).string());
+ String16 key(headers->keyAt(i).c_str());
+ String16 val(headers->valueAt(i).c_str());
tmp.append(key);
tmp.append(String16(": "));
diff --git a/media/libmedia/IMediaMetadataRetriever.cpp b/media/libmedia/IMediaMetadataRetriever.cpp
index 86427ed..cdb1837 100644
--- a/media/libmedia/IMediaMetadataRetriever.cpp
+++ b/media/libmedia/IMediaMetadataRetriever.cpp
@@ -218,7 +218,7 @@
} else {
mMetadata.replaceValueFor(keyCode, value);
}
- return mMetadata.valueFor(keyCode).string();
+ return mMetadata.valueFor(keyCode).c_str();
} else {
return NULL;
}
diff --git a/media/libmedia/IMediaRecorder.cpp b/media/libmedia/IMediaRecorder.cpp
index e191999..755a147 100644
--- a/media/libmedia/IMediaRecorder.cpp
+++ b/media/libmedia/IMediaRecorder.cpp
@@ -255,7 +255,7 @@
status_t setParameters(const String8& params)
{
- ALOGV("setParameter(%s)", params.string());
+ ALOGV("setParameter(%s)", params.c_str());
Parcel data, reply;
data.writeInterfaceToken(IMediaRecorder::getInterfaceDescriptor());
data.writeString8(params);
@@ -275,7 +275,7 @@
status_t setClientName(const String16& clientName)
{
- ALOGV("setClientName(%s)", String8(clientName).string());
+ ALOGV("setClientName(%s)", String8(clientName).c_str());
Parcel data, reply;
data.writeInterfaceToken(IMediaRecorder::getInterfaceDescriptor());
data.writeString16(clientName);
diff --git a/media/libmedia/include/media/omx/1.0/Conversion.h b/media/libmedia/include/media/omx/1.0/Conversion.h
index 811936b..70217d5 100644
--- a/media/libmedia/include/media/omx/1.0/Conversion.h
+++ b/media/libmedia/include/media/omx/1.0/Conversion.h
@@ -796,11 +796,11 @@
*/
// convert: IOMX::ComponentInfo -> IOmx::ComponentInfo
inline bool convertTo(IOmx::ComponentInfo* t, IOMX::ComponentInfo const& l) {
- t->mName = l.mName.string();
+ t->mName = l.mName.c_str();
t->mRoles.resize(l.mRoles.size());
size_t i = 0;
for (auto& role : l.mRoles) {
- t->mRoles[i++] = role.string();
+ t->mRoles[i++] = role.c_str();
}
return true;
}
diff --git a/media/libmedia/mediarecorder.cpp b/media/libmedia/mediarecorder.cpp
index bd06fb6..48f5e4b 100644
--- a/media/libmedia/mediarecorder.cpp
+++ b/media/libmedia/mediarecorder.cpp
@@ -472,7 +472,7 @@
}
status_t MediaRecorder::setParameters(const String8& params) {
- ALOGV("setParameters(%s)", params.string());
+ ALOGV("setParameters(%s)", params.c_str());
if (mMediaRecorder == NULL) {
ALOGE("media recorder is not initialized yet");
return INVALID_OPERATION;
@@ -496,7 +496,7 @@
status_t ret = mMediaRecorder->setParameters(params);
if (OK != ret) {
- ALOGE("setParameters(%s) failed: %d", params.string(), ret);
+ ALOGE("setParameters(%s) failed: %d", params.c_str(), ret);
// Do not change our current state to MEDIA_RECORDER_ERROR, failures
// of the only currently supported parameters, "max-duration" and
// "max-filesize" are _not_ fatal.
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index c08da0f..2a2a37b 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -237,7 +237,7 @@
if (hasFlattenedTag) {
// the tags are UTF16, convert to UTF8
String16 tags = parcel.readString16();
- ssize_t realTagSize = utf16_to_utf8_length(tags.string(), tags.size());
+ ssize_t realTagSize = utf16_to_utf8_length(tags.c_str(), tags.size());
if (realTagSize <= 0) {
strcpy(attributes->tags, "");
} else {
@@ -245,7 +245,7 @@
// copying array size -1, array for tags was calloc'd, no need to NULL-terminate it
size_t tagSize = realTagSize > AUDIO_ATTRIBUTES_TAGS_MAX_SIZE - 1 ?
AUDIO_ATTRIBUTES_TAGS_MAX_SIZE - 1 : realTagSize;
- utf16_to_utf8(tags.string(), tagSize, attributes->tags,
+ utf16_to_utf8(tags.c_str(), tagSize, attributes->tags,
sizeof(attributes->tags) / sizeof(attributes->tags[0]));
}
} else {
@@ -434,7 +434,7 @@
}
}
result.append("\n");
- ::write(fd, result.string(), result.size());
+ ::write(fd, result.c_str(), result.size());
}
@@ -549,7 +549,7 @@
mAuxEffectId, mSendLevel);
result.append(buffer);
- ::write(fd, result.string(), result.size());
+ ::write(fd, result.c_str(), result.size());
if (mTrack != 0) {
mTrack->dump(fd, args);
}
@@ -584,7 +584,7 @@
} else {
result.append(" lock is taken, no dump from player and audio output\n");
}
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
if (p != NULL) {
p->dump(fd, args);
@@ -644,7 +644,7 @@
snprintf(buffer, 255, " MediaRecorderClient pid(%d)\n",
c->mAttributionSource.pid);
result.append(buffer);
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
result = "\n";
c->dump(fd, args);
@@ -746,7 +746,7 @@
result.append(s.c_str(), s.size());
}
}
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
return NO_ERROR;
}
@@ -1249,7 +1249,7 @@
const BufferingSettings& buffering)
{
ALOGV("[%d] setBufferingSettings{%s}",
- mConnId, buffering.toString().string());
+ mConnId, buffering.toString().c_str());
sp<MediaPlayerBase> p = getPlayer();
if (p == 0) return UNKNOWN_ERROR;
return p->setBufferingSettings(buffering);
@@ -1264,7 +1264,7 @@
status_t ret = p->getBufferingSettings(buffering);
if (ret == NO_ERROR) {
ALOGV("[%d] getBufferingSettings{%s}",
- mConnId, buffering->toString().string());
+ mConnId, buffering->toString().c_str());
} else {
ALOGE("[%d] getBufferingSettings returned %d", mConnId, ret);
}
diff --git a/media/libmediaplayerservice/MediaRecorderClient.cpp b/media/libmediaplayerservice/MediaRecorderClient.cpp
index 58fc06d..d6b1c90 100644
--- a/media/libmediaplayerservice/MediaRecorderClient.cpp
+++ b/media/libmediaplayerservice/MediaRecorderClient.cpp
@@ -245,7 +245,7 @@
}
status_t MediaRecorderClient::setParameters(const String8& params) {
- ALOGV("setParameters(%s)", params.string());
+ ALOGV("setParameters(%s)", params.c_str());
Mutex::Autolock lock(mLock);
if (mRecorder == NULL) {
ALOGE("recorder is not initialized");
@@ -519,7 +519,7 @@
}
status_t MediaRecorderClient::setClientName(const String16& clientName) {
- ALOGV("setClientName(%s)", String8(clientName).string());
+ ALOGV("setClientName(%s)", String8(clientName).c_str());
Mutex::Autolock lock(mLock);
if (mRecorder == NULL) {
ALOGE("recorder is not initialized");
diff --git a/media/libmediaplayerservice/MetadataRetrieverClient.cpp b/media/libmediaplayerservice/MetadataRetrieverClient.cpp
index fb228ca..9e289d0 100644
--- a/media/libmediaplayerservice/MetadataRetrieverClient.cpp
+++ b/media/libmediaplayerservice/MetadataRetrieverClient.cpp
@@ -67,7 +67,7 @@
result.append(" MetadataRetrieverClient\n");
snprintf(buffer, 255, " pid(%d)\n", mPid);
result.append(buffer);
- write(fd, result.string(), result.size());
+ write(fd, result.c_str(), result.size());
write(fd, "\n", 1);
return NO_ERROR;
}
diff --git a/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp b/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp
index b3f7f25..82410f8 100644
--- a/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp
+++ b/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp
@@ -471,7 +471,7 @@
return NULL;
}
- return mMetaData.valueAt(index).string();
+ return mMetaData.valueAt(index).c_str();
}
void StagefrightMetadataRetriever::parseColorAspects(const sp<MetaData>& meta) {
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index 6f8c102..1dfd53d 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -519,7 +519,7 @@
// Trim both leading and trailing whitespace from the given string.
static void TrimString(String8 *s) {
size_t num_bytes = s->bytes();
- const char *data = s->string();
+ const char *data = s->c_str();
size_t leading_space = 0;
while (leading_space < num_bytes && isspace(data[leading_space])) {
@@ -823,9 +823,9 @@
}
status_t StagefrightRecorder::setParamRtpLocalIp(const String8 &localIp) {
- ALOGV("setParamVideoLocalIp: %s", localIp.string());
+ ALOGV("setParamVideoLocalIp: %s", localIp.c_str());
- mLocalIp.setTo(localIp.string());
+ mLocalIp.setTo(localIp.c_str());
return OK;
}
@@ -837,9 +837,9 @@
}
status_t StagefrightRecorder::setParamRtpRemoteIp(const String8 &remoteIp) {
- ALOGV("setParamVideoRemoteIp: %s", remoteIp.string());
+ ALOGV("setParamVideoRemoteIp: %s", remoteIp.c_str());
- mRemoteIp.setTo(remoteIp.string());
+ mRemoteIp.setTo(remoteIp.c_str());
return OK;
}
@@ -929,197 +929,197 @@
}
status_t StagefrightRecorder::setLogSessionId(const String8 &log_session_id) {
- ALOGV("setLogSessionId: %s", log_session_id.string());
+ ALOGV("setLogSessionId: %s", log_session_id.c_str());
// TODO: validity check that log_session_id is a 32-byte hex digit.
- mLogSessionId.setTo(log_session_id.string());
+ mLogSessionId.setTo(log_session_id.c_str());
return OK;
}
status_t StagefrightRecorder::setParameter(
const String8 &key, const String8 &value) {
- ALOGV("setParameter: key (%s) => value (%s)", key.string(), value.string());
+ ALOGV("setParameter: key (%s) => value (%s)", key.c_str(), value.c_str());
if (key == "max-duration") {
int64_t max_duration_ms;
- if (safe_strtoi64(value.string(), &max_duration_ms)) {
+ if (safe_strtoi64(value.c_str(), &max_duration_ms)) {
return setParamMaxFileDurationUs(1000LL * max_duration_ms);
}
} else if (key == "max-filesize") {
int64_t max_filesize_bytes;
- if (safe_strtoi64(value.string(), &max_filesize_bytes)) {
+ if (safe_strtoi64(value.c_str(), &max_filesize_bytes)) {
return setParamMaxFileSizeBytes(max_filesize_bytes);
}
} else if (key == "interleave-duration-us") {
int32_t durationUs;
- if (safe_strtoi32(value.string(), &durationUs)) {
+ if (safe_strtoi32(value.c_str(), &durationUs)) {
return setParamInterleaveDuration(durationUs);
}
} else if (key == "param-movie-time-scale") {
int32_t timeScale;
- if (safe_strtoi32(value.string(), &timeScale)) {
+ if (safe_strtoi32(value.c_str(), &timeScale)) {
return setParamMovieTimeScale(timeScale);
}
} else if (key == "param-use-64bit-offset") {
int32_t use64BitOffset;
- if (safe_strtoi32(value.string(), &use64BitOffset)) {
+ if (safe_strtoi32(value.c_str(), &use64BitOffset)) {
return setParam64BitFileOffset(use64BitOffset != 0);
}
} else if (key == "param-geotag-longitude") {
int64_t longitudex10000;
- if (safe_strtoi64(value.string(), &longitudex10000)) {
+ if (safe_strtoi64(value.c_str(), &longitudex10000)) {
return setParamGeoDataLongitude(longitudex10000);
}
} else if (key == "param-geotag-latitude") {
int64_t latitudex10000;
- if (safe_strtoi64(value.string(), &latitudex10000)) {
+ if (safe_strtoi64(value.c_str(), &latitudex10000)) {
return setParamGeoDataLatitude(latitudex10000);
}
} else if (key == "param-track-time-status") {
int64_t timeDurationUs;
- if (safe_strtoi64(value.string(), &timeDurationUs)) {
+ if (safe_strtoi64(value.c_str(), &timeDurationUs)) {
return setParamTrackTimeStatus(timeDurationUs);
}
} else if (key == "audio-param-sampling-rate") {
int32_t sampling_rate;
- if (safe_strtoi32(value.string(), &sampling_rate)) {
+ if (safe_strtoi32(value.c_str(), &sampling_rate)) {
return setParamAudioSamplingRate(sampling_rate);
}
} else if (key == "audio-param-number-of-channels") {
int32_t number_of_channels;
- if (safe_strtoi32(value.string(), &number_of_channels)) {
+ if (safe_strtoi32(value.c_str(), &number_of_channels)) {
return setParamAudioNumberOfChannels(number_of_channels);
}
} else if (key == "audio-param-encoding-bitrate") {
int32_t audio_bitrate;
- if (safe_strtoi32(value.string(), &audio_bitrate)) {
+ if (safe_strtoi32(value.c_str(), &audio_bitrate)) {
return setParamAudioEncodingBitRate(audio_bitrate);
}
} else if (key == "audio-param-time-scale") {
int32_t timeScale;
- if (safe_strtoi32(value.string(), &timeScale)) {
+ if (safe_strtoi32(value.c_str(), &timeScale)) {
return setParamAudioTimeScale(timeScale);
}
} else if (key == "video-param-encoding-bitrate") {
int32_t video_bitrate;
- if (safe_strtoi32(value.string(), &video_bitrate)) {
+ if (safe_strtoi32(value.c_str(), &video_bitrate)) {
return setParamVideoEncodingBitRate(video_bitrate);
}
} else if (key == "video-param-bitrate-mode") {
int32_t video_bitrate_mode;
- if (safe_strtoi32(value.string(), &video_bitrate_mode)) {
+ if (safe_strtoi32(value.c_str(), &video_bitrate_mode)) {
return setParamVideoBitRateMode(video_bitrate_mode);
}
} else if (key == "video-param-rotation-angle-degrees") {
int32_t degrees;
- if (safe_strtoi32(value.string(), °rees)) {
+ if (safe_strtoi32(value.c_str(), °rees)) {
return setParamVideoRotation(degrees);
}
} else if (key == "video-param-i-frames-interval") {
int32_t seconds;
- if (safe_strtoi32(value.string(), &seconds)) {
+ if (safe_strtoi32(value.c_str(), &seconds)) {
return setParamVideoIFramesInterval(seconds);
}
} else if (key == "video-param-encoder-profile") {
int32_t profile;
- if (safe_strtoi32(value.string(), &profile)) {
+ if (safe_strtoi32(value.c_str(), &profile)) {
return setParamVideoEncoderProfile(profile);
}
} else if (key == "video-param-encoder-level") {
int32_t level;
- if (safe_strtoi32(value.string(), &level)) {
+ if (safe_strtoi32(value.c_str(), &level)) {
return setParamVideoEncoderLevel(level);
}
} else if (key == "video-param-camera-id") {
int32_t cameraId;
- if (safe_strtoi32(value.string(), &cameraId)) {
+ if (safe_strtoi32(value.c_str(), &cameraId)) {
return setParamVideoCameraId(cameraId);
}
} else if (key == "video-param-time-scale") {
int32_t timeScale;
- if (safe_strtoi32(value.string(), &timeScale)) {
+ if (safe_strtoi32(value.c_str(), &timeScale)) {
return setParamVideoTimeScale(timeScale);
}
} else if (key == "time-lapse-enable") {
int32_t captureFpsEnable;
- if (safe_strtoi32(value.string(), &captureFpsEnable)) {
+ if (safe_strtoi32(value.c_str(), &captureFpsEnable)) {
return setParamCaptureFpsEnable(captureFpsEnable);
}
} else if (key == "time-lapse-fps") {
double fps;
- if (safe_strtod(value.string(), &fps)) {
+ if (safe_strtod(value.c_str(), &fps)) {
return setParamCaptureFps(fps);
}
} else if (key == "rtp-param-local-ip") {
return setParamRtpLocalIp(value);
} else if (key == "rtp-param-local-port") {
int32_t localPort;
- if (safe_strtoi32(value.string(), &localPort)) {
+ if (safe_strtoi32(value.c_str(), &localPort)) {
return setParamRtpLocalPort(localPort);
}
} else if (key == "rtp-param-remote-ip") {
return setParamRtpRemoteIp(value);
} else if (key == "rtp-param-remote-port") {
int32_t remotePort;
- if (safe_strtoi32(value.string(), &remotePort)) {
+ if (safe_strtoi32(value.c_str(), &remotePort)) {
return setParamRtpRemotePort(remotePort);
}
} else if (key == "rtp-param-self-id") {
int32_t selfID;
int64_t temp;
- if (safe_strtoi64(value.string(), &temp)) {
+ if (safe_strtoi64(value.c_str(), &temp)) {
selfID = static_cast<int32_t>(temp);
return setParamSelfID(selfID);
}
} else if (key == "rtp-param-opponent-id") {
int32_t opnId;
int64_t temp;
- if (safe_strtoi64(value.string(), &temp)) {
+ if (safe_strtoi64(value.c_str(), &temp)) {
opnId = static_cast<int32_t>(temp);
return setParamVideoOpponentID(opnId);
}
} else if (key == "rtp-param-payload-type") {
int32_t payloadType;
- if (safe_strtoi32(value.string(), &payloadType)) {
+ if (safe_strtoi32(value.c_str(), &payloadType)) {
return setParamPayloadType(payloadType);
}
} else if (key == "rtp-param-ext-cvo-extmap") {
int32_t extmap;
- if (safe_strtoi32(value.string(), &extmap)) {
+ if (safe_strtoi32(value.c_str(), &extmap)) {
return setRTPCVOExtMap(extmap);
}
} else if (key == "rtp-param-ext-cvo-degrees") {
int32_t degrees;
- if (safe_strtoi32(value.string(), °rees)) {
+ if (safe_strtoi32(value.c_str(), °rees)) {
return setRTPCVODegrees(degrees);
}
} else if (key == "video-param-request-i-frame") {
return requestIDRFrame();
} else if (key == "rtp-param-set-socket-dscp") {
int32_t dscp;
- if (safe_strtoi32(value.string(), &dscp)) {
+ if (safe_strtoi32(value.c_str(), &dscp)) {
return setParamRtpDscp(dscp);
}
} else if (key == "rtp-param-set-socket-ecn") {
int32_t targetEcn;
- if (safe_strtoi32(value.string(), &targetEcn)) {
+ if (safe_strtoi32(value.c_str(), &targetEcn)) {
return setParamRtpEcn(targetEcn);
}
} else if (key == "rtp-param-set-socket-network") {
int64_t networkHandle;
- if (safe_strtoi64(value.string(), &networkHandle)) {
+ if (safe_strtoi64(value.c_str(), &networkHandle)) {
return setSocketNetwork(networkHandle);
}
} else if (key == "log-session-id") {
return setLogSessionId(value);
} else {
- ALOGE("setParameter: failed to find key %s", key.string());
+ ALOGE("setParameter: failed to find key %s", key.c_str());
}
return BAD_VALUE;
}
status_t StagefrightRecorder::setParameters(const String8 ¶ms) {
- ALOGV("setParameters: %s", params.string());
- const char *cparams = params.string();
+ ALOGV("setParameters: %s", params.c_str());
+ const char *cparams = params.c_str();
const char *key_start = cparams;
for (;;) {
const char *equal_pos = strchr(key_start, '=');
@@ -2676,7 +2676,7 @@
result.append(buffer);
snprintf(buffer, SIZE, " Bit rate (bps): %d\n", mVideoBitRate);
result.append(buffer);
- ::write(fd, result.string(), result.size());
+ ::write(fd, result.c_str(), result.size());
return OK;
}
} // namespace android
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index 36e4d4a..dd4509d 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -270,7 +270,7 @@
}
ALOGV("initFromDataSource mSources.size(): %zu mIsSecure: %d mime[0]: %s", mSources.size(),
- mIsSecure, (mMimes.isEmpty() ? "NONE" : mMimes[0].string()));
+ mIsSecure, (mMimes.isEmpty() ? "NONE" : mMimes[0].c_str()));
if (mSources.size() == 0) {
ALOGE("b/23705695");
@@ -292,12 +292,12 @@
*buffering = mBufferingSettings;
}
- ALOGV("getBufferingSettings{%s}", buffering->toString().string());
+ ALOGV("getBufferingSettings{%s}", buffering->toString().c_str());
return OK;
}
status_t NuPlayer::GenericSource::setBufferingSettings(const BufferingSettings& buffering) {
- ALOGV("setBufferingSettings{%s}", buffering.toString().string());
+ ALOGV("setBufferingSettings{%s}", buffering.toString().c_str());
Mutex::Autolock _l(mLock);
mBufferingSettings = buffering;
@@ -1614,7 +1614,7 @@
return status;
}
ALOGV("prepareDrm: createCryptoAndPlugin succeeded for uuid: %s",
- DrmUUID::toHexString(uuid).string());
+ DrmUUID::toHexString(uuid).c_str());
*outCrypto = crypto;
// as long a there is an active crypto
@@ -1627,7 +1627,7 @@
}
// first mime in this list is either the video track, or the first audio track
- const char *mime = mMimes[0].string();
+ const char *mime = mMimes[0].c_str();
mIsSecure = crypto->requiresSecureDecoderComponent(mime);
ALOGV("prepareDrm: requiresSecureDecoderComponent mime: %s isSecure: %d",
mime, mIsSecure);
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index f73c5a8..e2b2d1f 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -370,7 +370,7 @@
}
void NuPlayer::setDataSourceAsync(const String8& rtpParams) {
- ALOGD("setDataSourceAsync for RTP = %s", rtpParams.string());
+ ALOGD("setDataSourceAsync for RTP = %s", rtpParams.c_str());
sp<AMessage> msg = new AMessage(kWhatSetDataSource, this);
sp<AMessage> notify = new AMessage(kWhatSourceNotify, this);
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDrm.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDrm.cpp
index a964d4f..8525192 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDrm.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDrm.cpp
@@ -89,8 +89,8 @@
drmSchemes.add(_uuid);
ALOGV("ParsePSSH[%zu]: %s: %s", numentries,
- _uuid.toHexString().string(),
- DrmUUID::arrayToHex(data, datalen).string()
+ _uuid.toHexString().c_str(),
+ DrmUUID::arrayToHex(data, datalen).c_str()
);
numentries++;
@@ -167,7 +167,7 @@
parcel->writeByteArray(psshsize, (const uint8_t*)pssh);
ALOGV("retrieveDrmInfo: MEDIA_DRM_INFO PSSH: size: %zu %s", psshsize,
- DrmUUID::arrayToHex((uint8_t*)pssh, psshsize).string());
+ DrmUUID::arrayToHex((uint8_t*)pssh, psshsize).c_str());
// 2) supportedDRMs
Vector<DrmUUID> supportedDRMs = getSupportedDrmSchemes(pssh, psshsize);
@@ -177,7 +177,7 @@
parcel->writeByteArray(DrmUUID::UUID_SIZE, uuid.ptr());
ALOGV("retrieveDrmInfo: MEDIA_DRM_INFO supportedScheme[%zu] %s", i,
- uuid.toHexString().string());
+ uuid.toHexString().c_str());
}
}
diff --git a/media/libmediaplayerservice/nuplayer/RTPSource.cpp b/media/libmediaplayerservice/nuplayer/RTPSource.cpp
index fd03150..efe1a80 100644
--- a/media/libmediaplayerservice/nuplayer/RTPSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/RTPSource.cpp
@@ -56,7 +56,7 @@
mReceivedFirstRTPPacket(false),
mPausing(false),
mPauseGeneration(0) {
- ALOGD("RTPSource initialized with rtpParams=%s", rtpParams.string());
+ ALOGD("RTPSource initialized with rtpParams=%s", rtpParams.c_str());
}
NuPlayer::RTPSource::~RTPSource() {
@@ -661,7 +661,7 @@
}
status_t NuPlayer::RTPSource::setParameter(const String8 &key, const String8 &value) {
- ALOGV("setParameter: key (%s) => value (%s)", key.string(), value.string());
+ ALOGV("setParameter: key (%s) => value (%s)", key.c_str(), value.c_str());
bool isAudioKey = key.contains("audio");
TrackInfo *info = NULL;
@@ -684,12 +684,12 @@
if (key == "rtp-param-mime-type") {
info->mMimeType = value;
- const char *mime = value.string();
+ const char *mime = value.c_str();
const char *delimiter = strchr(mime, '/');
info->mCodecName = delimiter ? (delimiter + 1) : "<none>";
ALOGV("rtp-param-mime-type: mMimeType (%s) => mCodecName (%s)",
- info->mMimeType.string(), info->mCodecName.string());
+ info->mMimeType.c_str(), info->mCodecName.c_str());
} else if (key == "video-param-decoder-profile") {
info->mCodecProfile = atoi(value);
} else if (key == "video-param-decoder-level") {
@@ -732,8 +732,8 @@
}
status_t NuPlayer::RTPSource::setParameters(const String8 ¶ms) {
- ALOGV("setParameters: %s", params.string());
- const char *cparams = params.string();
+ ALOGV("setParameters: %s", params.c_str());
+ const char *cparams = params.c_str();
const char *key_start = cparams;
for (;;) {
const char *equal_pos = strchr(key_start, '=');
@@ -784,7 +784,7 @@
//static
void NuPlayer::RTPSource::TrimString(String8 *s) {
size_t num_bytes = s->bytes();
- const char *data = s->string();
+ const char *data = s->c_str();
size_t leading_space = 0;
while (leading_space < num_bytes && isspace(data[leading_space])) {
diff --git a/media/libstagefright/CallbackDataSource.cpp b/media/libstagefright/CallbackDataSource.cpp
index eb3cb45..ede4855 100644
--- a/media/libstagefright/CallbackDataSource.cpp
+++ b/media/libstagefright/CallbackDataSource.cpp
@@ -38,7 +38,7 @@
mName = String8::format("CallbackDataSource(%d->%d, %s)",
getpid(),
IPCThreadState::self()->getCallingPid(),
- mIDataSource->toString().string());
+ mIDataSource->toString().c_str());
}
@@ -120,7 +120,7 @@
TinyCacheSource::TinyCacheSource(const sp<DataSource>& source)
: mSource(source), mCachedOffset(0), mCachedSize(0) {
- mName = String8::format("TinyCacheSource(%s)", mSource->toString().string());
+ mName = String8::format("TinyCacheSource(%s)", mSource->toString().c_str());
}
status_t TinyCacheSource::initCheck() const {
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index 89ebe7b..1a3a2da 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -604,7 +604,7 @@
result.append(buffer);
snprintf(buffer, SIZE, " mStarted: %s\n", mStarted? "true": "false");
result.append(buffer);
- ::write(fd, result.string(), result.size());
+ ::write(fd, result.c_str(), result.size());
for (List<Track *>::iterator it = mTracks.begin();
it != mTracks.end(); ++it) {
(*it)->dump(fd, args);
@@ -626,7 +626,7 @@
result.append(buffer);
snprintf(buffer, SIZE, " duration encoded : %" PRId64 " us\n", mTrackDurationUs);
result.append(buffer);
- ::write(fd, result.string(), result.size());
+ ::write(fd, result.c_str(), result.size());
return OK;
}
diff --git a/media/libstagefright/MediaExtractorFactory.cpp b/media/libstagefright/MediaExtractorFactory.cpp
index 2520e2a..1c72a65 100644
--- a/media/libstagefright/MediaExtractorFactory.cpp
+++ b/media/libstagefright/MediaExtractorFactory.cpp
@@ -242,22 +242,22 @@
continue;
}
void *libHandle = android_dlopen_ext(
- libPath.string(),
+ libPath.c_str(),
RTLD_NOW | RTLD_LOCAL, dlextinfo);
if (libHandle == nullptr) {
- ALOGI("dlopen(%s) reported error %s", libPath.string(), strerror(errno));
+ ALOGI("dlopen(%s) reported error %s", libPath.c_str(), strerror(errno));
continue;
}
GetExtractorDef getDef =
(GetExtractorDef) dlsym(libHandle, "GETEXTRACTORDEF");
if (getDef == nullptr) {
- ALOGI("no sniffer found in %s", libPath.string());
+ ALOGI("no sniffer found in %s", libPath.c_str());
dlclose(libHandle);
continue;
}
- ALOGV("registering sniffer for %s", libPath.string());
+ ALOGV("registering sniffer for %s", libPath.c_str());
RegisterExtractor(
new ExtractorPlugin(getDef(), libHandle, libPath), pluginList);
}
@@ -387,7 +387,7 @@
out.append(" (no plugins registered)\n");
}
}
- write(fd, out.string(), out.size());
+ write(fd, out.c_str(), out.size());
return OK;
}
diff --git a/media/libstagefright/NuMediaExtractor.cpp b/media/libstagefright/NuMediaExtractor.cpp
index d736734..079a963 100644
--- a/media/libstagefright/NuMediaExtractor.cpp
+++ b/media/libstagefright/NuMediaExtractor.cpp
@@ -164,7 +164,7 @@
const char* NuMediaExtractor::getName() const {
Mutex::Autolock autoLock(mLock);
- return mImpl == nullptr ? nullptr : mName.string();
+ return mImpl == nullptr ? nullptr : mName.c_str();
}
static String8 arrayToString(const std::vector<uint8_t> &array) {
diff --git a/media/libstagefright/httplive/HTTPDownloader.cpp b/media/libstagefright/httplive/HTTPDownloader.cpp
index 68f1de9..a15b66d 100644
--- a/media/libstagefright/httplive/HTTPDownloader.cpp
+++ b/media/libstagefright/httplive/HTTPDownloader.cpp
@@ -265,7 +265,7 @@
#endif
sp<M3UParser> playlist =
- new M3UParser(actualUrl.string(), buffer->data(), buffer->size());
+ new M3UParser(actualUrl.c_str(), buffer->data(), buffer->size());
if (playlist->initCheck() != OK) {
ALOGE("failed to parse .m3u8 playlist");
diff --git a/media/libstagefright/include/media/stagefright/RemoteDataSource.h b/media/libstagefright/include/media/stagefright/RemoteDataSource.h
index d605cda..621d772 100644
--- a/media/libstagefright/include/media/stagefright/RemoteDataSource.h
+++ b/media/libstagefright/include/media/stagefright/RemoteDataSource.h
@@ -106,7 +106,7 @@
if (mMemory.get() == nullptr) {
ALOGE("Failed to allocate memory!");
}
- mName = String8::format("RemoteDataSource(%s)", mSource->toString().string());
+ mName = String8::format("RemoteDataSource(%s)", mSource->toString().c_str());
}
DISALLOW_EVIL_CONSTRUCTORS(RemoteDataSource);
diff --git a/media/libstagefright/omx/OMXStore.cpp b/media/libstagefright/omx/OMXStore.cpp
index 4827d9e..20dc6eb 100644
--- a/media/libstagefright/omx/OMXStore.cpp
+++ b/media/libstagefright/omx/OMXStore.cpp
@@ -166,7 +166,7 @@
if (mPluginByComponentName.indexOfKey(name8) >= 0) {
ALOGE("A component of name '%s' already exists, ignoring this one.",
- name8.string());
+ name8.c_str());
continue;
}
@@ -262,7 +262,7 @@
const String8 &name8 = mPluginByComponentName.keyAt(index);
CHECK(size >= 1 + name8.size());
- strcpy(name, name8.string());
+ strcpy(name, name8.c_str());
return OMX_ErrorNone;
}
diff --git a/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h b/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h
index 264c01d..cf236d8 100644
--- a/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h
+++ b/media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h
@@ -532,11 +532,11 @@
*/
// convert: IOMX::ComponentInfo -> IOmx::ComponentInfo
inline bool convertTo(IOmx::ComponentInfo* t, IOMX::ComponentInfo const& l) {
- t->mName = l.mName.string();
+ t->mName = l.mName.c_str();
t->mRoles.resize(l.mRoles.size());
size_t i = 0;
for (auto& role : l.mRoles) {
- t->mRoles[i++] = role.string();
+ t->mRoles[i++] = role.c_str();
}
return true;
}
diff --git a/media/libstagefright/omx/tests/OMXHarness.cpp b/media/libstagefright/omx/tests/OMXHarness.cpp
index 039991c..b9bea1a 100644
--- a/media/libstagefright/omx/tests/OMXHarness.cpp
+++ b/media/libstagefright/omx/tests/OMXHarness.cpp
@@ -789,7 +789,7 @@
for (List<IOMX::ComponentInfo>::iterator it = componentInfos.begin();
it != componentInfos.end(); ++it) {
const IOMX::ComponentInfo &info = *it;
- const char *componentName = info.mName.string();
+ const char *componentName = info.mName.c_str();
if (strncmp(componentName, "OMX.google.", 11)) {
continue;
@@ -797,7 +797,7 @@
for (List<String8>::const_iterator role_it = info.mRoles.begin();
role_it != info.mRoles.end(); ++role_it) {
- const char *componentRole = (*role_it).string();
+ const char *componentRole = (*role_it).c_str();
err = test(componentName, componentRole);
diff --git a/media/libstagefright/renderfright/gl/GLExtensions.cpp b/media/libstagefright/renderfright/gl/GLExtensions.cpp
index 2924b0e..4717c68 100644
--- a/media/libstagefright/renderfright/gl/GLExtensions.cpp
+++ b/media/libstagefright/renderfright/gl/GLExtensions.cpp
@@ -68,19 +68,19 @@
}
char const* GLExtensions::getVendor() const {
- return mVendor.string();
+ return mVendor.c_str();
}
char const* GLExtensions::getRenderer() const {
- return mRenderer.string();
+ return mRenderer.c_str();
}
char const* GLExtensions::getVersion() const {
- return mVersion.string();
+ return mVersion.c_str();
}
char const* GLExtensions::getExtensions() const {
- return mExtensions.string();
+ return mExtensions.c_str();
}
void GLExtensions::initWithEGLStrings(char const* eglVersion, char const* eglExtensions) {
@@ -123,11 +123,11 @@
}
char const* GLExtensions::getEGLVersion() const {
- return mEGLVersion.string();
+ return mEGLVersion.c_str();
}
char const* GLExtensions::getEGLExtensions() const {
- return mEGLExtensions.string();
+ return mEGLExtensions.c_str();
}
} // namespace gl
diff --git a/media/libstagefright/renderfright/gl/ProgramCache.cpp b/media/libstagefright/renderfright/gl/ProgramCache.cpp
index af55172..350f0b7 100644
--- a/media/libstagefright/renderfright/gl/ProgramCache.cpp
+++ b/media/libstagefright/renderfright/gl/ProgramCache.cpp
@@ -62,7 +62,7 @@
return out;
}
friend inline Formatter& operator<<(Formatter& out, const String8& in) {
- return operator<<(out, in.string());
+ return operator<<(out, in.c_str());
}
friend inline Formatter& operator<<(Formatter& to, FormaterManipFunc func) {
return (*func)(to);
@@ -778,7 +778,7 @@
// fragment shader
String8 fs = generateFragmentShader(needs);
- return std::make_unique<Program>(needs, vs.string(), fs.string());
+ return std::make_unique<Program>(needs, vs.c_str(), fs.c_str());
}
void ProgramCache::useProgram(EGLContext context, const Description& description) {
diff --git a/media/libstagefright/rtsp/AAVCAssembler.cpp b/media/libstagefright/rtsp/AAVCAssembler.cpp
index 100c0cd..fc9f58e 100644
--- a/media/libstagefright/rtsp/AAVCAssembler.cpp
+++ b/media/libstagefright/rtsp/AAVCAssembler.cpp
@@ -203,12 +203,12 @@
seqNum, mNextExpectedSeqNo,
baseJbTimeMs, dynamicJbTimeMs, tryJbTimeMs, JITTER_MULTIPLE);
if (isSecondLineBroken) {
- ALOGE("%s", info.string());
+ ALOGE("%s", info.c_str());
printNowTimeMs(startTimeMs, nowTimeMs, playedTimeMs);
printRTPTime(rtpTime, playedTimeRtp, expiredTimeRtp, isExpired);
} else {
- ALOGW("%s", info.string());
+ ALOGW("%s", info.c_str());
}
}
diff --git a/media/libstagefright/rtsp/AHEVCAssembler.cpp b/media/libstagefright/rtsp/AHEVCAssembler.cpp
index 7b5c24a..06f19ab 100644
--- a/media/libstagefright/rtsp/AHEVCAssembler.cpp
+++ b/media/libstagefright/rtsp/AHEVCAssembler.cpp
@@ -213,12 +213,12 @@
seqNum, mNextExpectedSeqNo,
baseJbTimeMs, dynamicJbTimeMs, tryJbTimeMs, JITTER_MULTIPLE);
if (isSecondLineBroken) {
- ALOGE("%s", info.string());
+ ALOGE("%s", info.c_str());
printNowTimeMs(startTimeMs, nowTimeMs, playedTimeMs);
printRTPTime(rtpTime, playedTimeRtp, expiredTimeRtp, isExpired);
} else {
- ALOGW("%s", info.string());
+ ALOGW("%s", info.c_str());
}
}
diff --git a/media/libstagefright/rtsp/ARTPWriter.cpp b/media/libstagefright/rtsp/ARTPWriter.cpp
index 41f2d67..41e9aff 100644
--- a/media/libstagefright/rtsp/ARTPWriter.cpp
+++ b/media/libstagefright/rtsp/ARTPWriter.cpp
@@ -1647,11 +1647,11 @@
memset(&mRTCPAddr6, 0, sizeof(mRTCPAddr6));
mLocalAddr6.sin6_family = AF_INET6;
- inet_pton(AF_INET6, localIp.string(), &mLocalAddr6.sin6_addr);
+ inet_pton(AF_INET6, localIp.c_str(), &mLocalAddr6.sin6_addr);
mLocalAddr6.sin6_port = htons((uint16_t)localPort);
mRTPAddr6.sin6_family = AF_INET6;
- inet_pton(AF_INET6, remoteIp.string(), &mRTPAddr6.sin6_addr);
+ inet_pton(AF_INET6, remoteIp.c_str(), &mRTPAddr6.sin6_addr);
mRTPAddr6.sin6_port = htons((uint16_t)remotePort);
mRTCPAddr6 = mRTPAddr6;
@@ -1662,11 +1662,11 @@
memset(&mRTCPAddr, 0, sizeof(mRTCPAddr));
mLocalAddr.sin_family = AF_INET;
- mLocalAddr.sin_addr.s_addr = inet_addr(localIp.string());
+ mLocalAddr.sin_addr.s_addr = inet_addr(localIp.c_str());
mLocalAddr.sin_port = htons((uint16_t)localPort);
mRTPAddr.sin_family = AF_INET;
- mRTPAddr.sin_addr.s_addr = inet_addr(remoteIp.string());
+ mRTPAddr.sin_addr.s_addr = inet_addr(remoteIp.c_str());
mRTPAddr.sin_port = htons((uint16_t)remotePort);
mRTCPAddr = mRTPAddr;
@@ -1679,9 +1679,9 @@
int sizeSockSt = mIsIPv6 ? sizeof(mLocalAddr6) : sizeof(mLocalAddr);
if (bind(mRTPSocket, localAddr, sizeSockSt) == -1) {
- ALOGE("failed to bind rtp %s:%d err=%s", localIp.string(), localPort, strerror(errno));
+ ALOGE("failed to bind rtp %s:%d err=%s", localIp.c_str(), localPort, strerror(errno));
} else {
- ALOGD("succeed to bind rtp %s:%d", localIp.string(), localPort);
+ ALOGD("succeed to bind rtp %s:%d", localIp.c_str(), localPort);
}
if (mIsIPv6)
@@ -1690,9 +1690,9 @@
mLocalAddr.sin_port = htons((uint16_t)(localPort + 1));
if (bind(mRTCPSocket, localAddr, sizeSockSt) == -1) {
- ALOGE("failed to bind rtcp %s:%d err=%s", localIp.string(), localPort + 1, strerror(errno));
+ ALOGE("failed to bind rtcp %s:%d err=%s", localIp.c_str(), localPort + 1, strerror(errno));
} else {
- ALOGD("succeed to bind rtcp %s:%d", localIp.string(), localPort + 1);
+ ALOGD("succeed to bind rtcp %s:%d", localIp.c_str(), localPort + 1);
}
}
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