From e9ea17b597915c6c47cae67c259367aa64cd7cff Mon Sep 17 00:00:00 2001 From: Tomasz Wasilczyk Date: Wed, 13 Sep 2023 04:22:40 +0000 Subject: [PATCH] Don't depend on String8 cast to C string [drm] Bug: 295394788 Test: m checkbuild Change-Id: Ie9b5530e5a1c726bd723ebd7e11a745893269acf --- drm/1.0/default/DrmPlugin.cpp | 4 ++-- drm/1.0/default/include/PluginLoader.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drm/1.0/default/DrmPlugin.cpp b/drm/1.0/default/DrmPlugin.cpp index dfa5d22a68..0a0a350d1a 100644 --- a/drm/1.0/default/DrmPlugin.cpp +++ b/drm/1.0/default/DrmPlugin.cpp @@ -133,8 +133,8 @@ namespace implementation { Vector 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)); diff --git a/drm/1.0/default/include/PluginLoader.h b/drm/1.0/default/include/PluginLoader.h index 5130b16826..a25dd41586 100644 --- a/drm/1.0/default/include/PluginLoader.h +++ b/drm/1.0/default/include/PluginLoader.h @@ -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); }