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

Commit 0bbbd55d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use String8/16 c_str [drm]" into main am: 3cc1fa79 am: 7da95bfa am:... 

Merge "Use String8/16 c_str [drm]" into main am: 3cc1fa79 am: 7da95bfa am: c63586cf am: 09109dc7

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2723935



Change-Id: I47755e16e93f6bfa603fcbd62afc85b41c319adc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 97b60050 09109dc7

drm/1.0/default/DrmPlugin.cpp

+2 −3
Original line number Diff line number Diff line
@@ -98,8 +98,7 @@ namespace implementation { 
                break;

            }

        }

        _hidl_cb(toStatus(status), toHidlVec(legacyRequest), requestType,

                 defaultUrl.string());

        _hidl_cb(toStatus(status), toHidlVec(legacyRequest), requestType, defaultUrl.c_str());

        return Void();

    }
@@ -219,7 +218,7 @@ namespace implementation { 
        String8 legacyValue;

        status_t status = mLegacyPlugin->getPropertyString(

                String8(propertyName.c_str()), legacyValue);

        _hidl_cb(toStatus(status), legacyValue.string());

        _hidl_cb(toStatus(status), legacyValue.c_str());

        return Void();

    }

drm/1.0/default/SharedLibrary.cpp

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ namespace V1_0 { 
namespace helper {



SharedLibrary::SharedLibrary(const String8& path) {

    mLibHandle = dlopen(path.string(), RTLD_NOW);

    mLibHandle = dlopen(path.c_str(), RTLD_NOW);

}



SharedLibrary::~SharedLibrary() {

drm/1.0/default/include/PluginLoader.h

+2 −2
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ class PluginLoader { 
         */

        String8 pluginDir(dir);



        DIR* pDir = opendir(pluginDir.string());

        DIR* pDir = opendir(pluginDir.c_str());

        if (pDir == NULL) {

            ALOGE("Failed to find plugin directory %s", pluginDir.string());

            ALOGE("Failed to find plugin directory %s", pluginDir.c_str());

        } else {

            struct dirent* pEntry;

            while ((pEntry = readdir(pDir))) {