Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12d15315 authored by Jeff Tinker's avatar Jeff Tinker Committed by android-build-merger
Browse files

Merge "Don't load legacy plugins from /vendor/lib/drm" into oc-dev am: 1de69ea1 

am: 4e8d0076

Change-Id: I18491147b70636a515b172d54ca60f82c0d33fff
parents 5b88c21f 4e8d0076

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) {