diff options
| author | 2011-12-12 07:47:34 -0800 | |
|---|---|---|
| committer | 2011-12-12 07:47:43 -0800 | |
| commit | f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1 (patch) | |
| tree | ed6b94ef5dce9d022765d605585e7593818eb500 | |
| parent | df83cfc95c1b909ffcfc31f3dd30262a49cffced (diff) | |
| parent | a5cbf023e349f2394ba6fc58d73b4375cfec4369 (diff) | |
Merge from ics-mr1
Change-Id: I209499775ddf68b380d0ec801d558e1dc86ab953
| -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 b2fa05378258..eaf884d5cf08 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; } |