mirror of
https://github.com/Evolution-X/hardware_interfaces
synced 2026-02-01 11:36:00 +00:00
Merge "Use String8/16 c_str [drm]" into main
This commit is contained in:
@@ -98,8 +98,7 @@ namespace implementation {
|
||||
break;
|
||||
}
|
||||
}
|
||||
_hidl_cb(toStatus(status), toHidlVec(legacyRequest), requestType,
|
||||
defaultUrl.string());
|
||||
_hidl_cb(toStatus(status), toHidlVec(legacyRequest), requestType, defaultUrl.c_str());
|
||||
return Void();
|
||||
}
|
||||
|
||||
@@ -219,7 +218,7 @@ namespace implementation {
|
||||
String8 legacyValue;
|
||||
status_t status = mLegacyPlugin->getPropertyString(
|
||||
String8(propertyName.c_str()), legacyValue);
|
||||
_hidl_cb(toStatus(status), legacyValue.string());
|
||||
_hidl_cb(toStatus(status), legacyValue.c_str());
|
||||
return Void();
|
||||
}
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ namespace V1_0 {
|
||||
namespace helper {
|
||||
|
||||
SharedLibrary::SharedLibrary(const String8& path) {
|
||||
mLibHandle = dlopen(path.string(), RTLD_NOW);
|
||||
mLibHandle = dlopen(path.c_str(), RTLD_NOW);
|
||||
}
|
||||
|
||||
SharedLibrary::~SharedLibrary() {
|
||||
|
||||
@@ -39,9 +39,9 @@ class PluginLoader {
|
||||
*/
|
||||
String8 pluginDir(dir);
|
||||
|
||||
DIR* pDir = opendir(pluginDir.string());
|
||||
DIR* pDir = opendir(pluginDir.c_str());
|
||||
if (pDir == NULL) {
|
||||
ALOGE("Failed to find plugin directory %s", pluginDir.string());
|
||||
ALOGE("Failed to find plugin directory %s", pluginDir.c_str());
|
||||
} else {
|
||||
struct dirent* pEntry;
|
||||
while ((pEntry = readdir(pDir))) {
|
||||
|
||||
Reference in New Issue
Block a user