From a9d421d3c05b98ee5481428ca3dcb3e3245140ff Mon Sep 17 00:00:00 2001
From: Jeff Tinker <jtinker@google.com>
Date: Fri, 9 Dec 2011 20:04:17 -0800
Subject: Fix drm enumeration order, resolves failure to play forward lock
 ringtones

Change-Id: I58e8a26849409bc3bf98b066c5e07c2a0c91e0c9
related-to-bug: 5735466
---
 drm/drmserver/DrmManager.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'drm')

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 @@ 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;
 
 }
-- 
cgit v1.1