diff options
author | Gloria Wang <gwang@google.com> | 2010-11-22 21:29:08 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-22 21:29:08 -0800 |
commit | 6dc4726e7fa14e4006f6790c6f1ba02cfe888870 (patch) | |
tree | 5162c29866b9b737bc3808fd196e437d8cf0c0e1 /drm/libdrmframework/include/DrmManager.h | |
parent | 321b630783709eeb18952c3408303489db4ea9eb (diff) | |
parent | f798e438c3997fd3fb39538bf3e958cfdc7a477c (diff) | |
download | frameworks_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/DrmManager.h')
-rw-r--r-- | drm/libdrmframework/include/DrmManager.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drm/libdrmframework/include/DrmManager.h b/drm/libdrmframework/include/DrmManager.h index a0250b7..e05366d 100644 --- a/drm/libdrmframework/include/DrmManager.h +++ b/drm/libdrmframework/include/DrmManager.h @@ -32,6 +32,7 @@ class DrmUnregistrationInfo; class DrmRightsAcquisitionInfo; class DrmContentIds; class DrmConstraints; +class DrmMetadata; class DrmRights; class DrmInfo; class DrmInfoStatus; @@ -74,6 +75,8 @@ public: DrmConstraints* getConstraints(int uniqueId, const String8* path, const int action); + DrmMetadata* getMetadata(int uniqueId, const String8* path); + bool canHandle(int uniqueId, const String8& path, const String8& mimeType); DrmInfoStatus* processDrmInfo(int uniqueId, const DrmInfo* drmInfo); |