summaryrefslogtreecommitdiffstats
path: root/drm/drmserver
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2011-12-12 15:39:17 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-12 15:39:17 -0800
commit50a44951baf856cda679e78947e369ce923a6517 (patch)
treeed289e8d756105114a04b35dbef3c027454f49f7 /drm/drmserver
parentfec2284d520fa2856358692095a715678225abcb (diff)
parent2a82a3a8824904f4e6750eb18dcc33ed113edbeb (diff)
downloadframeworks_av-50a44951baf856cda679e78947e369ce923a6517.zip
frameworks_av-50a44951baf856cda679e78947e369ce923a6517.tar.gz
frameworks_av-50a44951baf856cda679e78947e369ce923a6517.tar.bz2
am f14dc291: Merge from ics-mr1
* commit 'f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1': Fix drm enumeration order, resolves failure to play forward lock ringtones
Diffstat (limited to 'drm/drmserver')
-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 3abf3d3..f6552dd 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;
}