commit a5cbf023e349f2394ba6fc58d73b4375cfec4369
author Jeff Tinker <jtinker@google.com> Fri Dec 09 20:04:17 2011 -0800
committer Jeff Tinker <jtinker@google.com> Fri Dec 09 20:04:17 2011 -0800
tree ed6b94ef5dce9d022765d605585e7593818eb500
parent 1cec30a182c1963beda4b6f11cfae9fa38061e68

Fix drm enumeration order, resolves failure to play forward lock ringtones

Change-Id: I58e8a26849409bc3bf98b066c5e07c2a0c91e0c9
related-to-bug: 5735466

drm/drmserver/DrmManager.cpp

diff --git a/drm/drmserver/DrmManager.cpp b/drm/drmserver/DrmManager.cpp
index b2fa053..eaf884d 100644
--- a/drm/drmserver/DrmManager.cpp
+++ b/drm/drmserver/DrmManager.cpp
@@ -99,11 +99,12 @@
 
 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;
 
 }