diff --git a/drm/1.0/default/DrmPlugin.cpp b/drm/1.0/default/DrmPlugin.cpp index 809f694f1a..dfa5d22a68 100644 --- a/drm/1.0/default/DrmPlugin.cpp +++ b/drm/1.0/default/DrmPlugin.cpp @@ -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(); } diff --git a/drm/1.0/default/SharedLibrary.cpp b/drm/1.0/default/SharedLibrary.cpp index 0a942cddeb..c9b53890ab 100644 --- a/drm/1.0/default/SharedLibrary.cpp +++ b/drm/1.0/default/SharedLibrary.cpp @@ -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() { diff --git a/drm/1.0/default/include/PluginLoader.h b/drm/1.0/default/include/PluginLoader.h index 0c45fb3efd..e243f42feb 100644 --- a/drm/1.0/default/include/PluginLoader.h +++ b/drm/1.0/default/include/PluginLoader.h @@ -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))) {