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

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

Merge from ics-mr1

Change-Id: I209499775ddf68b380d0ec801d558e1dc86ab953
parents df83cfc9 a5cbf023
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -99,11 +99,12 @@ void DrmManager::removeUniqueId(int uniqueId) {

status_t DrmManager::loadPlugIns() {

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

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

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

}