diff options
| author | Jeff Tinker <jtinker@google.com> | 2013-03-22 15:32:27 -0700 |
|---|---|---|
| committer | Jeff Tinker <jtinker@google.com> | 2013-03-22 15:32:27 -0700 |
| commit | 90defba919e8e969a9963bf401a7b144d869accf (patch) | |
| tree | a2d0172227159cc373cc7d953fb79deefd747803 /media/jni/android_media_MediaCrypto.cpp | |
| parent | fd81f91052d54c0354834fcd4f423025f2d8c93e (diff) | |
Load crypto plugins from additional shared libraries
Currently crypto plugins are expected to be in libdrmdecrypt.so.
When there are multiple plugins supporting different schemes,
this approach requires source code integration across
vendors which is unmanagable. Also, for integration with
MediaDrm where the crypto keys are obtained from a drm server,
the MediaCrypto plugin needs to interoperate with the MediaDrm
plugin. This change allows {MediaCrypto, MediaDrm} pairs that
are logically related to be implemented in a common shared
library.
Multi-repository commit, goes with:
https://googleplex-android-review.googlesource.com/287838
Change-Id: I08577cda0cbcb22ebe3cb874f5fcafe411c36be3
Diffstat (limited to 'media/jni/android_media_MediaCrypto.cpp')
| -rw-r--r-- | media/jni/android_media_MediaCrypto.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_media_MediaCrypto.cpp b/media/jni/android_media_MediaCrypto.cpp index 517a293535a0..d0f56ea57cb7 100644 --- a/media/jni/android_media_MediaCrypto.cpp +++ b/media/jni/android_media_MediaCrypto.cpp @@ -74,7 +74,7 @@ sp<ICrypto> JCrypto::MakeCrypto() { sp<ICrypto> crypto = service->makeCrypto(); - if (crypto == NULL || crypto->initCheck() != OK) { + if (crypto == NULL || (crypto->initCheck() != OK && crypto->initCheck() != NO_INIT)) { return NULL; } |