commit 40375099d10139b6c96c1db8b8295874d60c712e
author The Android Open Source Project <initial-contribution@android.com> Mon Dec 12 07:59:17 2011 -0800
committer The Android Open Source Project <initial-contribution@android.com> Mon Dec 12 07:59:17 2011 -0800
tree ed6b94ef5dce9d022765d605585e7593818eb500
parent f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1
parent c721ba76a4c432e2ad15a3fafe63c43a4235ae51

Reconcile with ics-mr1-release

Change-Id: Ic9c27c987ae88da9ab333632b47837b0ff1dd6d3

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