diff options
| author | Jeff Tinker <jtinker@google.com> | 2011-12-09 20:04:17 -0800 |
|---|---|---|
| committer | Jeff Tinker <jtinker@google.com> | 2011-12-09 20:04:17 -0800 |
| commit | a9d421d3c05b98ee5481428ca3dcb3e3245140ff (patch) | |
| tree | 9923d2dba8b8bf93adb3e4a54aa8788031f6c75b /drm | |
| parent | 7e976e926dd8085a64a7add97ce09bfeca26e088 (diff) | |
| download | frameworks_av-a9d421d3c05b98ee5481428ca3dcb3e3245140ff.zip frameworks_av-a9d421d3c05b98ee5481428ca3dcb3e3245140ff.tar.gz frameworks_av-a9d421d3c05b98ee5481428ca3dcb3e3245140ff.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.cpp | 5 |
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; } |