commit 50a44951baf856cda679e78947e369ce923a6517
author The Android Open Source Project <initial-contribution@android.com> Mon Dec 12 15:39:17 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Dec 12 15:39:17 2011 -0800
tree ed289e8d756105114a04b35dbef3c027454f49f7
parent fec2284d520fa2856358692095a715678225abcb
parent 2a82a3a8824904f4e6750eb18dcc33ed113edbeb

am f14dc291: Merge from ics-mr1

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

drm/drmserver/DrmManager.cpp

diff --git a/drm/drmserver/DrmManager.cpp b/drm/drmserver/DrmManager.cpp
index 3abf3d3..f6552dd 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;
 
 }