diff options
| author | Gloria Wang <gwang@google.com> | 2010-11-03 11:39:04 -0700 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2010-11-03 11:39:04 -0700 |
| commit | b251f75d5ca3fa19cfe8a284717e00dec31f18ea (patch) | |
| tree | edb48bc69001ca3ef96bf072d71441bc8a60d547 /drm/common/DrmEngineBase.cpp | |
| parent | bf3122eed31cd24acdf5cfd25541db0beb77e6f0 (diff) | |
| parent | 3041096d137144d9d1ebdd6df88ebe8e85133c05 (diff) | |
| download | frameworks_av-b251f75d5ca3fa19cfe8a284717e00dec31f18ea.zip frameworks_av-b251f75d5ca3fa19cfe8a284717e00dec31f18ea.tar.gz frameworks_av-b251f75d5ca3fa19cfe8a284717e00dec31f18ea.tar.bz2 | |
resolved conflicts for merge of a8d7b747 to master
Change-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349
Diffstat (limited to 'drm/common/DrmEngineBase.cpp')
| -rw-r--r-- | drm/common/DrmEngineBase.cpp | 5 |
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); } |