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

Merge "Use String8/16 c_str [drm]" into main am: 3cc1fa796e am: 7da95bfa92

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

Change-Id: Ia9aabb9beb60da1e7ff5b820ac6ad45b8eaa043a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-08-24 19:29:59 +00:00
committed by Automerger Merge Worker
parent f5c1a00e5f 7da95bfa92
commit c63586cf30
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,8 +98,7 @@ namespace implementation {
break; break;
} }
} }
_hidl_cb(toStatus(status), toHidlVec(legacyRequest), requestType, _hidl_cb(toStatus(status), toHidlVec(legacyRequest), requestType, defaultUrl.c_str());
defaultUrl.string());
return Void(); return Void();
} }
@@ -219,7 +218,7 @@ namespace implementation {
String8 legacyValue; String8 legacyValue;
status_t status = mLegacyPlugin->getPropertyString( status_t status = mLegacyPlugin->getPropertyString(
String8(propertyName.c_str()), legacyValue); String8(propertyName.c_str()), legacyValue);
_hidl_cb(toStatus(status), legacyValue.string()); _hidl_cb(toStatus(status), legacyValue.c_str());
return Void(); return Void();
} }

2
drm/1.0/default/SharedLibrary.cpp
View File

@@ -26,7 +26,7 @@ namespace V1_0 {
namespace helper { namespace helper {
SharedLibrary::SharedLibrary(const String8& path) { SharedLibrary::SharedLibrary(const String8& path) {
mLibHandle = dlopen(path.string(), RTLD_NOW); mLibHandle = dlopen(path.c_str(), RTLD_NOW);
} }
SharedLibrary::~SharedLibrary() { SharedLibrary::~SharedLibrary() {

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

@@ -39,9 +39,9 @@ class PluginLoader {
*/ */
String8 pluginDir(dir); String8 pluginDir(dir);
DIR* pDir = opendir(pluginDir.string()); DIR* pDir = opendir(pluginDir.c_str());
if (pDir == NULL) { if (pDir == NULL) {
ALOGE("Failed to find plugin directory %s", pluginDir.string()); ALOGE("Failed to find plugin directory %s", pluginDir.c_str());
} else { } else {
struct dirent* pEntry; struct dirent* pEntry;
while ((pEntry = readdir(pDir))) { while ((pEntry = readdir(pDir))) {