Merge "Don't load legacy plugins from /vendor/lib/drm" into oc-dev (4e8d0076) · Commits · e / os / android_frameworks_av

drm/drmserver/DrmManager.cpp

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -88,14 +88,9 @@ void DrmManager::removeUniqueId(int uniqueId) {
	}		}

	status_t DrmManager::loadPlugIns() {		status_t DrmManager::loadPlugIns() {

	String8 vendorPluginDirPath("/vendor/lib/drm");
	loadPlugIns(vendorPluginDirPath);

	String8 pluginDirPath("/system/lib/drm");		String8 pluginDirPath("/system/lib/drm");
	loadPlugIns(pluginDirPath);		loadPlugIns(pluginDirPath);
	return DRM_NO_ERROR;		return DRM_NO_ERROR;

	}		}

	status_t DrmManager::loadPlugIns(const String8& plugInDirPath) {		status_t DrmManager::loadPlugIns(const String8& plugInDirPath) {