diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2011-12-12 15:39:17 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-12 15:39:17 -0800 |
| commit | b34027bb2fc3394d054986d7bbbcf54261436c11 (patch) | |
| tree | 17a01b8d785326379ea875618e42ef0effd04c37 /drm | |
| parent | afb847a4692a6e5cded8c7a330d00b70b794896a (diff) | |
| parent | f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1 (diff) | |
| download | frameworks_base-b34027bb2fc3394d054986d7bbbcf54261436c11.zip frameworks_base-b34027bb2fc3394d054986d7bbbcf54261436c11.tar.gz frameworks_base-b34027bb2fc3394d054986d7bbbcf54261436c11.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')
| -rw-r--r-- | drm/drmserver/DrmManager.cpp | 5 |
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; } |