diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2011-12-12 07:47:34 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2011-12-12 07:47:43 -0800 |
| commit | 2a82a3a8824904f4e6750eb18dcc33ed113edbeb (patch) | |
| tree | 9923d2dba8b8bf93adb3e4a54aa8788031f6c75b /drm/drmserver | |
| parent | 736d8141e8f060c79c297c5447cdbe2c7fa9e231 (diff) | |
| parent | a9d421d3c05b98ee5481428ca3dcb3e3245140ff (diff) | |
| download | frameworks_av-2a82a3a8824904f4e6750eb18dcc33ed113edbeb.zip frameworks_av-2a82a3a8824904f4e6750eb18dcc33ed113edbeb.tar.gz frameworks_av-2a82a3a8824904f4e6750eb18dcc33ed113edbeb.tar.bz2 | |
Merge from ics-mr1
Change-Id: I209499775ddf68b380d0ec801d558e1dc86ab953
Diffstat (limited to 'drm/drmserver')
| -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; } |