summaryrefslogtreecommitdiffstats
path: root/drm
diff options
context:
space:
mode:
authorJeff Tinker <jtinker@google.com>2011-12-09 20:04:17 -0800
committerJeff Tinker <jtinker@google.com>2011-12-09 20:04:17 -0800
commita5cbf023e349f2394ba6fc58d73b4375cfec4369 (patch)
treeed6b94ef5dce9d022765d605585e7593818eb500 /drm
parent1cec30a182c1963beda4b6f11cfae9fa38061e68 (diff)
downloadframeworks_base-a5cbf023e349f2394ba6fc58d73b4375cfec4369.zip
frameworks_base-a5cbf023e349f2394ba6fc58d73b4375cfec4369.tar.gz
frameworks_base-a5cbf023e349f2394ba6fc58d73b4375cfec4369.tar.bz2
Fix drm enumeration order, resolves failure to play forward lock ringtones
Change-Id: I58e8a26849409bc3bf98b066c5e07c2a0c91e0c9 related-to-bug: 5735466
Diffstat (limited to 'drm')
-rw-r--r--drm/drmserver/DrmManager.cpp5
1 files changed, 3 insertions, 2 deletions
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;
}