Merge from ics-mr1

Change-Id: I209499775ddf68b380d0ec801d558e1dc86ab953
2011-12-12 07:47:34 -08:00
parent df83cfc95c a5cbf023e3
commit f14dc29104
1 changed files with 3 additions and 2 deletions
--- a/drm/drmserver/DrmManager.cpp
+++ b/drm/drmserver/DrmManager.cpp
@@ -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;

 }