Merge "Load crypto plugins from additional shared libraries" into jb-mr2-dev

2013-03-25 20:18:18 +00:00
parent f00529d901 90defba919
commit 4d572b0134
1 changed files with 1 additions and 1 deletions
--- 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;
    }