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

Commit b34027bb authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am f14dc291: Merge from ics-mr1 

* commit 'f14dc291':
  Fix drm enumeration order, resolves failure to play forward lock ringtones
parents afb847a4 f14dc291

drm/drmserver/DrmManager.cpp

+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;



}