From 90defba919e8e969a9963bf401a7b144d869accf Mon Sep 17 00:00:00 2001 From: Jeff Tinker Date: Fri, 22 Mar 2013 15:32:27 -0700 Subject: [PATCH] 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 --- media/jni/android_media_MediaCrypto.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/jni/android_media_MediaCrypto.cpp b/media/jni/android_media_MediaCrypto.cpp index 517a293535a02..d0f56ea57cb71 100644 --- a/media/jni/android_media_MediaCrypto.cpp +++ b/media/jni/android_media_MediaCrypto.cpp @@ -74,7 +74,7 @@ sp JCrypto::MakeCrypto() { sp crypto = service->makeCrypto(); - if (crypto == NULL || crypto->initCheck() != OK) { + if (crypto == NULL || (crypto->initCheck() != OK && crypto->initCheck() != NO_INIT)) { return NULL; }