diff --git a/cas/1.0/default/CasImpl.cpp b/cas/1.0/default/CasImpl.cpp index 178020e477..98e7593a8b 100644 --- a/cas/1.0/default/CasImpl.cpp +++ b/cas/1.0/default/CasImpl.cpp @@ -103,8 +103,7 @@ Return CasImpl::openSession(openSession_cb _hidl_cb) { Return CasImpl::setSessionPrivateData( const HidlCasSessionId &sessionId, const HidlCasData& pvtData) { - ALOGV("%s: sessionId=%s", __FUNCTION__, - sessionIdToString(sessionId).string()); + ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).c_str()); std::shared_ptr holder = std::atomic_load(&mPluginHolder); if (holder.get() == nullptr) { return toStatus(INVALID_OPERATION); @@ -113,8 +112,7 @@ Return CasImpl::setSessionPrivateData( } Return CasImpl::closeSession(const HidlCasSessionId &sessionId) { - ALOGV("%s: sessionId=%s", __FUNCTION__, - sessionIdToString(sessionId).string()); + ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).c_str()); std::shared_ptr holder = std::atomic_load(&mPluginHolder); if (holder.get() == nullptr) { return toStatus(INVALID_OPERATION); @@ -124,8 +122,7 @@ Return CasImpl::closeSession(const HidlCasSessionId &sessionId) { Return CasImpl::processEcm( const HidlCasSessionId &sessionId, const HidlCasData& ecm) { - ALOGV("%s: sessionId=%s", __FUNCTION__, - sessionIdToString(sessionId).string()); + ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).c_str()); std::shared_ptr holder = std::atomic_load(&mPluginHolder); if (holder.get() == nullptr) { return toStatus(INVALID_OPERATION); diff --git a/cas/1.0/default/DescramblerImpl.cpp b/cas/1.0/default/DescramblerImpl.cpp index f79b32db44..6b730ebf80 100644 --- a/cas/1.0/default/DescramblerImpl.cpp +++ b/cas/1.0/default/DescramblerImpl.cpp @@ -62,8 +62,7 @@ DescramblerImpl::~DescramblerImpl() { } Return DescramblerImpl::setMediaCasSession(const HidlCasSessionId& sessionId) { - ALOGV("%s: sessionId=%s", __FUNCTION__, - sessionIdToString(sessionId).string()); + ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).c_str()); std::shared_ptr holder = std::atomic_load(&mPluginHolder); if (holder.get() == nullptr) { diff --git a/cas/1.0/default/FactoryLoader.h b/cas/1.0/default/FactoryLoader.h index 45e515afbf..b69a1b04b3 100644 --- a/cas/1.0/default/FactoryLoader.h +++ b/cas/1.0/default/FactoryLoader.h @@ -98,10 +98,10 @@ bool FactoryLoader::findFactoryForScheme( String8 dirPath("/vendor/lib/mediacas"); #endif - DIR* pDir = opendir(dirPath.string()); + DIR* pDir = opendir(dirPath.c_str()); if (pDir == NULL) { - ALOGE("Failed to open plugin directory %s", dirPath.string()); + ALOGE("Failed to open plugin directory %s", dirPath.c_str()); return false; } @@ -138,10 +138,10 @@ bool FactoryLoader::enumeratePlugins( String8 dirPath("/vendor/lib/mediacas"); #endif - DIR* pDir = opendir(dirPath.string()); + DIR* pDir = opendir(dirPath.c_str()); if (pDir == NULL) { - ALOGE("Failed to open plugin directory %s", dirPath.string()); + ALOGE("Failed to open plugin directory %s", dirPath.c_str()); return false; } diff --git a/cas/1.0/default/SharedLibrary.cpp b/cas/1.0/default/SharedLibrary.cpp index 9c7f38554a..90c84b88f3 100644 --- a/cas/1.0/default/SharedLibrary.cpp +++ b/cas/1.0/default/SharedLibrary.cpp @@ -29,7 +29,7 @@ namespace V1_0 { namespace implementation { SharedLibrary::SharedLibrary(const String8 &path) { - mLibHandle = dlopen(path.string(), RTLD_NOW); + mLibHandle = dlopen(path.c_str(), RTLD_NOW); } SharedLibrary::~SharedLibrary() { diff --git a/cas/1.1/default/CasImpl.cpp b/cas/1.1/default/CasImpl.cpp index 4cc6017028..105e0363b6 100644 --- a/cas/1.1/default/CasImpl.cpp +++ b/cas/1.1/default/CasImpl.cpp @@ -125,7 +125,7 @@ Return CasImpl::openSession(openSession_cb _hidl_cb) { Return CasImpl::setSessionPrivateData(const HidlCasSessionId& sessionId, const HidlCasData& pvtData) { - ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).string()); + ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).c_str()); std::shared_ptr holder = std::atomic_load(&mPluginHolder); if (holder.get() == nullptr) { return toStatus(INVALID_OPERATION); @@ -134,7 +134,7 @@ Return CasImpl::setSessionPrivateData(const HidlCasSessionId& sessionId, } Return CasImpl::closeSession(const HidlCasSessionId& sessionId) { - ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).string()); + ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).c_str()); std::shared_ptr holder = std::atomic_load(&mPluginHolder); if (holder.get() == nullptr) { return toStatus(INVALID_OPERATION); @@ -143,7 +143,7 @@ Return CasImpl::closeSession(const HidlCasSessionId& sessionId) { } Return CasImpl::processEcm(const HidlCasSessionId& sessionId, const HidlCasData& ecm) { - ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).string()); + ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).c_str()); std::shared_ptr holder = std::atomic_load(&mPluginHolder); if (holder.get() == nullptr) { return toStatus(INVALID_OPERATION); diff --git a/cas/1.1/default/DescramblerImpl.cpp b/cas/1.1/default/DescramblerImpl.cpp index 309cd3c007..9d2ead776e 100644 --- a/cas/1.1/default/DescramblerImpl.cpp +++ b/cas/1.1/default/DescramblerImpl.cpp @@ -59,7 +59,7 @@ DescramblerImpl::~DescramblerImpl() { } Return DescramblerImpl::setMediaCasSession(const HidlCasSessionId& sessionId) { - ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).string()); + ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).c_str()); std::shared_ptr holder = std::atomic_load(&mPluginHolder); if (holder.get() == nullptr) { diff --git a/cas/1.1/default/FactoryLoader.h b/cas/1.1/default/FactoryLoader.h index 121f90c333..07dc77263e 100644 --- a/cas/1.1/default/FactoryLoader.h +++ b/cas/1.1/default/FactoryLoader.h @@ -90,10 +90,10 @@ bool FactoryLoader::findFactoryForScheme(int32_t CA_system_id, sp::enumeratePlugins(vector* results #else String8 dirPath("/vendor/lib/mediacas"); #endif - DIR* pDir = opendir(dirPath.string()); + DIR* pDir = opendir(dirPath.c_str()); if (pDir == NULL) { - ALOGE("Failed to open plugin directory %s", dirPath.string()); + ALOGE("Failed to open plugin directory %s", dirPath.c_str()); return false; } diff --git a/cas/1.1/default/SharedLibrary.cpp b/cas/1.1/default/SharedLibrary.cpp index ffe4bb977a..ac5dbcf2fb 100644 --- a/cas/1.1/default/SharedLibrary.cpp +++ b/cas/1.1/default/SharedLibrary.cpp @@ -29,7 +29,7 @@ namespace V1_1 { namespace implementation { SharedLibrary::SharedLibrary(const String8& path) { - mLibHandle = dlopen(path.string(), RTLD_NOW); + mLibHandle = dlopen(path.c_str(), RTLD_NOW); } SharedLibrary::~SharedLibrary() { diff --git a/cas/1.2/default/CasImpl.cpp b/cas/1.2/default/CasImpl.cpp index 46dd25195e..b1038bc7d6 100644 --- a/cas/1.2/default/CasImpl.cpp +++ b/cas/1.2/default/CasImpl.cpp @@ -174,7 +174,7 @@ Return CasImpl::openSession_1_2(const SessionIntent intent, const Scrambli Return CasImpl::setSessionPrivateData(const HidlCasSessionId& sessionId, const HidlCasData& pvtData) { - ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).string()); + ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).c_str()); std::shared_ptr holder = std::atomic_load(&mPluginHolder); if (holder.get() == nullptr) { return toStatus(INVALID_OPERATION); @@ -183,7 +183,7 @@ Return CasImpl::setSessionPrivateData(const HidlCasSessionId& sessionId, } Return CasImpl::closeSession(const HidlCasSessionId& sessionId) { - ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).string()); + ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).c_str()); std::shared_ptr holder = std::atomic_load(&mPluginHolder); if (holder.get() == nullptr) { return toStatus(INVALID_OPERATION); @@ -192,7 +192,7 @@ Return CasImpl::closeSession(const HidlCasSessionId& sessionId) { } Return CasImpl::processEcm(const HidlCasSessionId& sessionId, const HidlCasData& ecm) { - ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).string()); + ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).c_str()); std::shared_ptr holder = std::atomic_load(&mPluginHolder); if (holder.get() == nullptr) { return toStatus(INVALID_OPERATION); diff --git a/cas/1.2/default/DescramblerImpl.cpp b/cas/1.2/default/DescramblerImpl.cpp index 309cd3c007..9d2ead776e 100644 --- a/cas/1.2/default/DescramblerImpl.cpp +++ b/cas/1.2/default/DescramblerImpl.cpp @@ -59,7 +59,7 @@ DescramblerImpl::~DescramblerImpl() { } Return DescramblerImpl::setMediaCasSession(const HidlCasSessionId& sessionId) { - ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).string()); + ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).c_str()); std::shared_ptr holder = std::atomic_load(&mPluginHolder); if (holder.get() == nullptr) { diff --git a/cas/1.2/default/FactoryLoader.h b/cas/1.2/default/FactoryLoader.h index a374b31891..d04e64c1a0 100644 --- a/cas/1.2/default/FactoryLoader.h +++ b/cas/1.2/default/FactoryLoader.h @@ -90,10 +90,10 @@ bool FactoryLoader::findFactoryForScheme(int32_t CA_system_id, sp::enumeratePlugins(vector* results #else String8 dirPath("/vendor/lib/mediacas"); #endif - DIR* pDir = opendir(dirPath.string()); + DIR* pDir = opendir(dirPath.c_str()); if (pDir == NULL) { - ALOGE("Failed to open plugin directory %s", dirPath.string()); + ALOGE("Failed to open plugin directory %s", dirPath.c_str()); return false; } diff --git a/cas/1.2/default/SharedLibrary.cpp b/cas/1.2/default/SharedLibrary.cpp index ffe4bb977a..ac5dbcf2fb 100644 --- a/cas/1.2/default/SharedLibrary.cpp +++ b/cas/1.2/default/SharedLibrary.cpp @@ -29,7 +29,7 @@ namespace V1_1 { namespace implementation { SharedLibrary::SharedLibrary(const String8& path) { - mLibHandle = dlopen(path.string(), RTLD_NOW); + mLibHandle = dlopen(path.c_str(), RTLD_NOW); } SharedLibrary::~SharedLibrary() { diff --git a/cas/aidl/default/CasImpl.cpp b/cas/aidl/default/CasImpl.cpp index f08fcc0f6d..9885e16cee 100644 --- a/cas/aidl/default/CasImpl.cpp +++ b/cas/aidl/default/CasImpl.cpp @@ -158,7 +158,7 @@ ScopedAStatus CasImpl::openSession(SessionIntent intent, ScramblingMode mode, ScopedAStatus CasImpl::setSessionPrivateData(const vector& sessionId, const vector& pvtData) { - ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).string()); + ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).c_str()); shared_ptr holder = atomic_load(&mPluginHolder); if (holder.get() == nullptr) { return toStatus(INVALID_OPERATION); @@ -167,7 +167,7 @@ ScopedAStatus CasImpl::setSessionPrivateData(const vector& sessionId, } ScopedAStatus CasImpl::closeSession(const vector& sessionId) { - ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).string()); + ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).c_str()); shared_ptr holder = atomic_load(&mPluginHolder); if (holder.get() == nullptr) { return toStatus(INVALID_OPERATION); @@ -176,7 +176,7 @@ ScopedAStatus CasImpl::closeSession(const vector& sessionId) { } ScopedAStatus CasImpl::processEcm(const vector& sessionId, const vector& ecm) { - ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).string()); + ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(sessionId).c_str()); shared_ptr holder = atomic_load(&mPluginHolder); if (holder.get() == nullptr) { return toStatus(INVALID_OPERATION); diff --git a/cas/aidl/default/DescramblerImpl.cpp b/cas/aidl/default/DescramblerImpl.cpp index a96fd466bc..d658887a38 100644 --- a/cas/aidl/default/DescramblerImpl.cpp +++ b/cas/aidl/default/DescramblerImpl.cpp @@ -54,7 +54,7 @@ DescramblerImpl::~DescramblerImpl() { } ScopedAStatus DescramblerImpl::setMediaCasSession(const vector& in_sessionId) { - ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(in_sessionId).string()); + ALOGV("%s: sessionId=%s", __FUNCTION__, sessionIdToString(in_sessionId).c_str()); shared_ptr holder = atomic_load(&mPluginHolder); if (holder.get() == nullptr) { diff --git a/cas/aidl/default/FactoryLoader.h b/cas/aidl/default/FactoryLoader.h index 443ea1fc8b..bc3d715fda 100644 --- a/cas/aidl/default/FactoryLoader.h +++ b/cas/aidl/default/FactoryLoader.h @@ -87,10 +87,10 @@ bool FactoryLoader::findFactoryForScheme(int32_t CA_system_id, #else String8 dirPath("/vendor/lib/mediacas"); #endif - DIR* pDir = opendir(dirPath.string()); + DIR* pDir = opendir(dirPath.c_str()); if (pDir == NULL) { - ALOGE("Failed to open plugin directory %s", dirPath.string()); + ALOGE("Failed to open plugin directory %s", dirPath.c_str()); return false; } @@ -124,10 +124,10 @@ bool FactoryLoader::enumeratePlugins(vector* results #else String8 dirPath("/vendor/lib/mediacas"); #endif - DIR* pDir = opendir(dirPath.string()); + DIR* pDir = opendir(dirPath.c_str()); if (pDir == NULL) { - ALOGE("Failed to open plugin directory %s", dirPath.string()); + ALOGE("Failed to open plugin directory %s", dirPath.c_str()); return false; } diff --git a/cas/aidl/default/SharedLibrary.cpp b/cas/aidl/default/SharedLibrary.cpp index e79f383e1f..c12d17d0cd 100644 --- a/cas/aidl/default/SharedLibrary.cpp +++ b/cas/aidl/default/SharedLibrary.cpp @@ -26,7 +26,7 @@ namespace hardware { namespace cas { SharedLibrary::SharedLibrary(const String8& path) { - mLibHandle = dlopen(path.string(), RTLD_NOW); + mLibHandle = dlopen(path.c_str(), RTLD_NOW); } SharedLibrary::~SharedLibrary() {