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

Commit 19f00f89 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Automerger Merge Worker
Browse files

Merge "Don't depend on String8 cast to C string [drm]" into main am: 15272cf2 

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



Change-Id: I560a707f4167057cc45f824fca9e96286c48a6c1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 23028081 15272cf2

drm/1.0/default/DrmPlugin.cpp

+2 −2
Original line number Diff line number Diff line
@@ -133,8 +133,8 @@ namespace implementation { 
        Vector<KeyValue> infoMapVec;

        for (size_t i = 0; i < legacyInfoMap.size(); i++) {

            KeyValue keyValuePair;

            keyValuePair.key = String8(legacyInfoMap.keyAt(i));

            keyValuePair.value = String8(legacyInfoMap.valueAt(i));

            keyValuePair.key = legacyInfoMap.keyAt(i);

            keyValuePair.value = legacyInfoMap.valueAt(i);

            infoMapVec.push_back(keyValuePair);

        }

        _hidl_cb(toStatus(status), toHidlVec(infoMapVec));

drm/1.0/default/include/PluginLoader.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ class PluginLoader { 
                String8 file(pEntry->d_name);

                if (base::EndsWith(file.c_str(), ".so")) {

                    String8 path = pluginDir + "/" + pEntry->d_name;

                    T *plugin = loadOne(path, entry);

                    T* plugin = loadOne(path.c_str(), entry);

                    if (plugin) {

                        factories.push(plugin);

                    }