Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f23e19a5 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Gerrit Code Review
Browse files

Merge "Use String8/16 c_str [cas]" into main

parents 3eb31551 3e74f0b9

cas/1.0/default/CasImpl.cpp

+3 −6
Original line number Diff line number Diff line
@@ -103,8 +103,7 @@ Return<void> CasImpl::openSession(openSession_cb _hidl_cb) { 


Return<Status> 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<CasPlugin> holder = std::atomic_load(&mPluginHolder);

    if (holder.get() == nullptr) {

        return toStatus(INVALID_OPERATION);
@@ -113,8 +112,7 @@ Return<Status> CasImpl::setSessionPrivateData( 
}



Return<Status> 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<CasPlugin> holder = std::atomic_load(&mPluginHolder);

    if (holder.get() == nullptr) {

        return toStatus(INVALID_OPERATION);
@@ -124,8 +122,7 @@ Return<Status> CasImpl::closeSession(const HidlCasSessionId &sessionId) { 


Return<Status> 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<CasPlugin> holder = std::atomic_load(&mPluginHolder);

    if (holder.get() == nullptr) {

        return toStatus(INVALID_OPERATION);

cas/1.0/default/DescramblerImpl.cpp

+1 −2
Original line number Diff line number Diff line
@@ -62,8 +62,7 @@ DescramblerImpl::~DescramblerImpl() { 
}



Return<Status> 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<DescramblerPlugin> holder = std::atomic_load(&mPluginHolder);

    if (holder.get() == nullptr) {

cas/1.0/default/FactoryLoader.h

+4 −4
Original line number Diff line number Diff line
@@ -98,10 +98,10 @@ bool FactoryLoader<T>::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<T>::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;

    }

cas/1.0/default/SharedLibrary.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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() {

cas/1.1/default/CasImpl.cpp

+3 −3
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ Return<void> CasImpl::openSession(openSession_cb _hidl_cb) { 


Return<Status> 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<CasPlugin> holder = std::atomic_load(&mPluginHolder);

    if (holder.get() == nullptr) {

        return toStatus(INVALID_OPERATION);
@@ -134,7 +134,7 @@ Return<Status> CasImpl::setSessionPrivateData(const HidlCasSessionId& sessionId, 
}



Return<Status> 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<CasPlugin> holder = std::atomic_load(&mPluginHolder);

    if (holder.get() == nullptr) {

        return toStatus(INVALID_OPERATION);
@@ -143,7 +143,7 @@ Return<Status> CasImpl::closeSession(const HidlCasSessionId& sessionId) { 
}



Return<Status> 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<CasPlugin> holder = std::atomic_load(&mPluginHolder);

    if (holder.get() == nullptr) {

        return toStatus(INVALID_OPERATION);