Use String8/16 c_str [media]
Bug: 295394788
Test: make checkbuild
Change-Id: I4ba5400f39c769bec59508525844f1daefe1d15c
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;
}