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

Commit 4d572b01 authored by Jeff Tinker's avatar Jeff Tinker Committed by Android (Google) Code Review
Browse files

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

parents f00529d9 90defba9

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;

    }