Merge "Let getOriginalMimeType() take a fd passed from Java applications" into jb-mr1-dev

2012-08-22 14:50:21 -07:00
parent 196fe01488 adad411ea6
commit 20e8e2b01c
2 changed files with 2 additions and 2 deletions
--- a/proprietary/drmwvmplugin/src/WVMDrmPlugin.cpp
+++ b/proprietary/drmwvmplugin/src/WVMDrmPlugin.cpp
@@ -542,7 +542,7 @@ bool WVMDrmPlugin::onCanHandle(int uniqueId, const String8& path) {
 * @return String8
 *     Returns mime-type of the original content, such as "video/mpeg"
 */
-String8 WVMDrmPlugin::onGetOriginalMimeType(int uniqueId, const String8& path) {
+String8 WVMDrmPlugin::onGetOriginalMimeType(int uniqueId, const String8& path, int fd) {
    //ALOGD("WVMDrmPlugin::onGetOriginalMimeType() : %d", uniqueId);
    return String8("video/wvm");
 }