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