Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6555a64f authored by Jeff Tinker's avatar Jeff Tinker Committed by Android Git Automerger
Browse files

am 4d572b01: Merge "Load crypto plugins from additional shared libraries" into jb-mr2-dev 

* commit '4d572b01':
  Load crypto plugins from additional shared libraries
parents d7afbeb5 4d572b01

media/jni/android_media_MediaCrypto.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }