tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

Change-Id: Id39357c52fa06672e16d1fd437f2a09567375ef1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tomasz Wasilczyk 2023-10-05 19:55:03 +00:00 committed by Automerger Merge Worker
commit da306554c5
2 changed files with 3 additions and 3 deletions
Show stats 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; Vector<KeyValue> infoMapVec;
for (size_t i = 0; i < legacyInfoMap.size(); i++) { for (size_t i = 0; i < legacyInfoMap.size(); i++) {
KeyValue keyValuePair; KeyValue keyValuePair;
keyValuePair.key = String8(legacyInfoMap.keyAt(i)); keyValuePair.key = legacyInfoMap.keyAt(i);
keyValuePair.value = String8(legacyInfoMap.valueAt(i)); keyValuePair.value = legacyInfoMap.valueAt(i);
infoMapVec.push_back(keyValuePair); infoMapVec.push_back(keyValuePair);
} }
_hidl_cb(toStatus(status), toHidlVec(infoMapVec)); _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); String8 file(pEntry->d_name);
if (base::EndsWith(file.c_str(), ".so")) { if (base::EndsWith(file.c_str(), ".so")) {
String8 path = pluginDir + "/" + pEntry->d_name; String8 path = pluginDir + "/" + pEntry->d_name;
T *plugin = loadOne(path, entry); T* plugin = loadOne(path.c_str(), entry);
if (plugin) { if (plugin) {
factories.push(plugin); factories.push(plugin);
} }