Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 21:37:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tomasz Wasilczyk
2023-10-05 18:53:20 +00:00
committed by Gerrit Code Review
parent 2e62fc4d3b e9ea17b597
commit 15272cf28e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drm/1.0/default/DrmPlugin.cpp
View File

@@ -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));

2
drm/1.0/default/include/PluginLoader.h
View File

@@ -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);
}