Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Modified loadPlugIns to load from /vendor and /system; skip libraries that are already loaded. BUG: 5284436"

Browse Source
This commit is contained in:
Edwin Wong
2011-09-21 23:05:57 -07:00
committed by Android (Google) Code Review
parent b35914bb90 aab6fe21df
commit 013ccb7010
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drm/drmserver/DrmManager.cpp
View File

@@ -98,21 +98,27 @@ void DrmManager::removeUniqueId(int uniqueId) {
} }
status_t DrmManager::loadPlugIns() { status_t DrmManager::loadPlugIns() {
String8 vendorPluginDirPath("/vendor/lib/drm");
loadPlugIns(vendorPluginDirPath);
String8 pluginDirPath("/system/lib/drm"); String8 pluginDirPath("/system/lib/drm");
return loadPlugIns(pluginDirPath); loadPlugIns(pluginDirPath);
return DRM_NO_ERROR;
} }
status_t DrmManager::loadPlugIns(const String8& plugInDirPath) { status_t DrmManager::loadPlugIns(const String8& plugInDirPath) {
if (mSupportInfoToPlugInIdMap.isEmpty()) { mPlugInManager.loadPlugIns(plugInDirPath);
mPlugInManager.loadPlugIns(plugInDirPath); Vector<String8> plugInPathList = mPlugInManager.getPlugInIdList();
Vector<String8> plugInPathList = mPlugInManager.getPlugInIdList(); for (unsigned int i = 0; i < plugInPathList.size(); ++i) {
for (unsigned int i = 0; i < plugInPathList.size(); ++i) { String8 plugInPath = plugInPathList[i];
String8 plugInPath = plugInPathList[i]; DrmSupportInfo* info = mPlugInManager.getPlugIn(plugInPath).getSupportInfo(0);
DrmSupportInfo* info = mPlugInManager.getPlugIn(plugInPath).getSupportInfo(0); if (NULL != info) {
if (NULL != info) { if (mSupportInfoToPlugInIdMap.indexOfKey(*info) < 0) {
mSupportInfoToPlugInIdMap.add(*info, plugInPath); mSupportInfoToPlugInIdMap.add(*info, plugInPath);
delete info;
} }
delete info;
} }
} }
return DRM_NO_ERROR; return DRM_NO_ERROR;