summaryrefslogtreecommitdiffstats
path: root/drm/drmserver/DrmManager.cpp
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2010-11-22 21:29:08 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-22 21:29:08 -0800
commit35f2d3997efe62ce7660ac558578ac5ca834f357 (patch)
tree9f6031e2e4bb9665e619bc881839477c14898a21 /drm/drmserver/DrmManager.cpp
parentc0ec802e96788c3002b737b02707875049758f98 (diff)
parent24a90c2674270fee0783bafa54fd5d845bdf0c18 (diff)
downloadframeworks_base-35f2d3997efe62ce7660ac558578ac5ca834f357.zip
frameworks_base-35f2d3997efe62ce7660ac558578ac5ca834f357.tar.gz
frameworks_base-35f2d3997efe62ce7660ac558578ac5ca834f357.tar.bz2
am 24a90c26: am d9334934: Merge "Update of DRM Framework."
* commit '24a90c2674270fee0783bafa54fd5d845bdf0c18': Update of DRM Framework.
Diffstat (limited to 'drm/drmserver/DrmManager.cpp')
-rw-r--r--drm/drmserver/DrmManager.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/drm/drmserver/DrmManager.cpp b/drm/drmserver/DrmManager.cpp
index 8da8176..9a6f787 100644
--- a/drm/drmserver/DrmManager.cpp
+++ b/drm/drmserver/DrmManager.cpp
@@ -23,6 +23,7 @@
#include <drm/DrmInfoEvent.h>
#include <drm/DrmRights.h>
#include <drm/DrmConstraints.h>
+#include <drm/DrmMetadata.h>
#include <drm/DrmInfoStatus.h>
#include <drm/DrmInfoRequest.h>
#include <drm/DrmSupportInfo.h>
@@ -148,6 +149,15 @@ DrmConstraints* DrmManager::getConstraints(int uniqueId, const String8* path, co
return NULL;
}
+DrmMetadata* DrmManager::getMetadata(int uniqueId, const String8* path) {
+ const String8 plugInId = getSupportedPlugInIdFromPath(uniqueId, *path);
+ if (EMPTY_STRING != plugInId) {
+ IDrmEngine& rDrmEngine = mPlugInManager.getPlugIn(plugInId);
+ return rDrmEngine.getMetadata(uniqueId, path);
+ }
+ return NULL;
+}
+
status_t DrmManager::installDrmEngine(int uniqueId, const String8& absolutePath) {
mPlugInManager.loadPlugIn(absolutePath);