summaryrefslogtreecommitdiffstats
path: root/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/include
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2012-07-30 17:57:39 -0700
committerJames Dong <jdong@google.com>2012-08-10 17:38:19 -0700
commitbf5b3b29e31b293313788d7464cfb258ac0da803 (patch)
tree1e3e016a1f7268688be59047be835a17609977f8 /drm/libdrmframework/plugins/forward-lock/FwdLockEngine/include
parentb3e12a4d15a329821979bf287c49a9630486e23f (diff)
downloadframeworks_av-bf5b3b29e31b293313788d7464cfb258ac0da803.zip
frameworks_av-bf5b3b29e31b293313788d7464cfb258ac0da803.tar.gz
frameworks_av-bf5b3b29e31b293313788d7464cfb258ac0da803.tar.bz2
Let getOriginalMimeType() take a fd passed from drm java applications
This patch enables the drm framework to avoid opening files directly. As a result, the drm framework no longer needs the sdcard read permision. o related-to-bug: 6426185 Change-Id: Ib176c35ef4b1a1a405e8e954f19a7985266f2510
Diffstat (limited to 'drm/libdrmframework/plugins/forward-lock/FwdLockEngine/include')
-rw-r--r--drm/libdrmframework/plugins/forward-lock/FwdLockEngine/include/FwdLockEngine.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/include/FwdLockEngine.h b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/include/FwdLockEngine.h
index c0e408e..a31b951 100644
--- a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/include/FwdLockEngine.h
+++ b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/include/FwdLockEngine.h
@@ -150,11 +150,12 @@ DrmInfo* onAcquireDrmInfo(int uniqueId,
* Retrieves the mime type embedded inside the original content.
*
* @param uniqueId Unique identifier for a session
- * @param path Path of the protected content
+ * @param path Path of the conent or null.
+ * @param fd descriptor of the protected content as a file source
* @return String8
* Returns mime-type of the original content, such as "video/mpeg"
*/
-String8 onGetOriginalMimeType(int uniqueId, const String8& path);
+String8 onGetOriginalMimeType(int uniqueId, const String8& path, int fd);
/**
* Retrieves the type of the protected object (content, rights, etc..)