summaryrefslogtreecommitdiffstats
path: root/drm/libdrmframework/include/IDrmManagerService.h
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
commit6dc4726e7fa14e4006f6790c6f1ba02cfe888870 (patch)
tree5162c29866b9b737bc3808fd196e437d8cf0c0e1 /drm/libdrmframework/include/IDrmManagerService.h
parent321b630783709eeb18952c3408303489db4ea9eb (diff)
parentf798e438c3997fd3fb39538bf3e958cfdc7a477c (diff)
downloadframeworks_av-6dc4726e7fa14e4006f6790c6f1ba02cfe888870.zip
frameworks_av-6dc4726e7fa14e4006f6790c6f1ba02cfe888870.tar.gz
frameworks_av-6dc4726e7fa14e4006f6790c6f1ba02cfe888870.tar.bz2
am 24a90c26: am d9334934: Merge "Update of DRM Framework."
* commit '24a90c2674270fee0783bafa54fd5d845bdf0c18': Update of DRM Framework.
Diffstat (limited to 'drm/libdrmframework/include/IDrmManagerService.h')
-rw-r--r--drm/libdrmframework/include/IDrmManagerService.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/drm/libdrmframework/include/IDrmManagerService.h b/drm/libdrmframework/include/IDrmManagerService.h
index 20fb2ab..2424ea5 100644
--- a/drm/libdrmframework/include/IDrmManagerService.h
+++ b/drm/libdrmframework/include/IDrmManagerService.h
@@ -27,6 +27,7 @@ namespace android {
class DrmContentIds;
class DrmConstraints;
+class DrmMetadata;
class DrmRights;
class DrmInfo;
class DrmInfoStatus;
@@ -51,6 +52,7 @@ public:
SET_DRM_SERVICE_LISTENER,
INSTALL_DRM_ENGINE,
GET_CONSTRAINTS_FROM_CONTENT,
+ GET_METADATA_FROM_CONTENT,
CAN_HANDLE,
PROCESS_DRM_INFO,
ACQUIRE_DRM_INFO,
@@ -96,6 +98,8 @@ public:
virtual DrmConstraints* getConstraints(
int uniqueId, const String8* path, const int action) = 0;
+ virtual DrmMetadata* getMetadata(int uniqueId, const String8* path) = 0;
+
virtual bool canHandle(int uniqueId, const String8& path, const String8& mimeType) = 0;
virtual DrmInfoStatus* processDrmInfo(int uniqueId, const DrmInfo* drmInfo) = 0;
@@ -179,6 +183,8 @@ public:
virtual DrmConstraints* getConstraints(int uniqueId, const String8* path, const int action);
+ virtual DrmMetadata* getMetadata(int uniqueId, const String8* path);
+
virtual bool canHandle(int uniqueId, const String8& path, const String8& mimeType);
virtual DrmInfoStatus* processDrmInfo(int uniqueId, const DrmInfo* drmInfo);