commit e9ea17b597915c6c47cae67c259367aa64cd7cff
author Tomasz Wasilczyk <twasilczyk@google.com> Wed Sep 13 04:22:40 2023 +0000
committer Tomasz Wasilczyk <twasilczyk@google.com> Wed Sep 13 04:25:14 2023 +0000
tree cc91082a2cb68f998ff9b364fd3e984d12daef80
parent d26b6cf395504574ef4d5707f66db2e4f2c4f3f3

Don't depend on String8 cast to C string [drm]

Bug: 295394788
Test: m checkbuild
Change-Id: Ie9b5530e5a1c726bd723ebd7e11a745893269acf

drm/1.0/default/DrmPlugin.cpp

diff --git a/drm/1.0/default/DrmPlugin.cpp b/drm/1.0/default/DrmPlugin.cpp
index dfa5d22..0a0a350 100644
--- a/drm/1.0/default/DrmPlugin.cpp
+++ b/drm/1.0/default/DrmPlugin.cpp
@@ -133,8 +133,8 @@
         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

diff --git a/drm/1.0/default/include/PluginLoader.h b/drm/1.0/default/include/PluginLoader.h
index 5130b16..a25dd41 100644
--- a/drm/1.0/default/include/PluginLoader.h
+++ b/drm/1.0/default/include/PluginLoader.h
@@ -50,7 +50,7 @@
                 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);
                     }