summaryrefslogtreecommitdiffstats
path: root/drm/common/DrmEngineBase.cpp
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2010-11-02 14:59:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-02 14:59:51 -0700
commita8d7b7477d99dd2671e6232e157da9954bf4699f (patch)
tree1d7dc40888d00b25724c1b82e63ea26521737fab /drm/common/DrmEngineBase.cpp
parent6fb9316f6bd72b406bbfc61bd210281744eea9c1 (diff)
parentef8a810b3b11d177a64111125eaa44bb76624414 (diff)
downloadframeworks_base-a8d7b7477d99dd2671e6232e157da9954bf4699f.zip
frameworks_base-a8d7b7477d99dd2671e6232e157da9954bf4699f.tar.gz
frameworks_base-a8d7b7477d99dd2671e6232e157da9954bf4699f.tar.bz2
am ef8a810b: Merge "Update of DRM framework"
* commit 'ef8a810b3b11d177a64111125eaa44bb76624414': Update of DRM framework
Diffstat (limited to 'drm/common/DrmEngineBase.cpp')
-rw-r--r--drm/common/DrmEngineBase.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/drm/common/DrmEngineBase.cpp b/drm/common/DrmEngineBase.cpp
index 17cdf54..10c64ee 100644
--- a/drm/common/DrmEngineBase.cpp
+++ b/drm/common/DrmEngineBase.cpp
@@ -120,6 +120,11 @@ status_t DrmEngineBase::openDecryptSession(
return onOpenDecryptSession(uniqueId, decryptHandle, fd, offset, length);
}
+status_t DrmEngineBase::openDecryptSession(
+ int uniqueId, DecryptHandle* decryptHandle, const char* uri) {
+ return onOpenDecryptSession(uniqueId, decryptHandle, uri);
+}
+
status_t DrmEngineBase::closeDecryptSession(int uniqueId, DecryptHandle* decryptHandle) {
return onCloseDecryptSession(uniqueId, decryptHandle);
}