Merge "Use String8/16 c_str [drm]" into main (3cc1fa79) · Commits · e / os / android_hardware_interfaces

drm/1.0/default/DrmPlugin.cpp

+2 −3

Original line number	Diff line number	Diff line
		@@ -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();
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -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() {

+2 −2

Original line number	Diff line number	Diff line
		@@ -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))) {