commit f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1
author The Android Open Source Project <initial-contribution@android.com> Mon Dec 12 07:47:34 2011 -0800
committer The Android Open Source Project <initial-contribution@android.com> Mon Dec 12 07:47:43 2011 -0800
tree ed6b94ef5dce9d022765d605585e7593818eb500
parent df83cfc95c1b909ffcfc31f3dd30262a49cffced
parent a5cbf023e349f2394ba6fc58d73b4375cfec4369

Merge from ics-mr1

Change-Id: I209499775ddf68b380d0ec801d558e1dc86ab953

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