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

Commit 2a82a3a8 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

Merge from ics-mr1 

Change-Id: I209499775ddf68b380d0ec801d558e1dc86ab953
parents 736d8141 a9d421d3

drm/drmserver/DrmManager.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -99,11 +99,12 @@ void DrmManager::removeUniqueId(int uniqueId) { 




status_t DrmManager::loadPlugIns() {

status_t DrmManager::loadPlugIns() {





    String8 pluginDirPath("/system/lib/drm");

    loadPlugIns(pluginDirPath);



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

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

    loadPlugIns(vendorPluginDirPath);

    loadPlugIns(vendorPluginDirPath);





    String8 pluginDirPath("/system/lib/drm");

    loadPlugIns(pluginDirPath);

    return DRM_NO_ERROR;

    return DRM_NO_ERROR;





}

}