diff options
| author | James Dong <jdong@google.com> | 2012-08-22 14:50:14 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-22 14:50:14 -0700 |
| commit | 9a150640a28d3fa5507a590125a6c004681bb221 (patch) | |
| tree | d45d6e643ac0fac5d0b80258b1ec38feccff4e9f /include | |
| parent | 0c676cd04ff15cc7eacf6144b4aead6deaccf60c (diff) | |
| parent | bf5b3b29e31b293313788d7464cfb258ac0da803 (diff) | |
| download | frameworks_av-9a150640a28d3fa5507a590125a6c004681bb221.zip frameworks_av-9a150640a28d3fa5507a590125a6c004681bb221.tar.gz frameworks_av-9a150640a28d3fa5507a590125a6c004681bb221.tar.bz2 | |
Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/DrmManagerClient.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/drm/DrmManagerClient.h b/include/drm/DrmManagerClient.h index a5c6992..866edac 100644 --- a/include/drm/DrmManagerClient.h +++ b/include/drm/DrmManagerClient.h @@ -279,10 +279,11 @@ public: * Retrieves the mime type embedded inside the original content * * @param[in] path the path of the protected content + * @param[in] fd the file descriptor of the protected content * @return String8 * Returns mime-type of the original content, such as "video/mpeg" */ - String8 getOriginalMimeType(const String8& path); + String8 getOriginalMimeType(const String8& path, int fd); /** * Retrieves the type of the protected object (content, rights, etc..) |