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

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

Merge "Pass all DRM errors through ICrypto" into mnc-dev

parents a0cf6c4d ceffd8cc

media/libmedia/ICrypto.cpp

+2 −3
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ struct BpCrypto : public BpInterface<ICrypto> { 


        ssize_t result = reply.readInt32();



        if (result >= ERROR_DRM_VENDOR_MIN && result <= ERROR_DRM_VENDOR_MAX) {

        if (isCryptoError(result)) {

            errorDetailMsg->setTo(reply.readCString());

        }
@@ -319,8 +319,7 @@ status_t BnCrypto::onTransact( 


            reply->writeInt32(result);



            if (result >= ERROR_DRM_VENDOR_MIN

                && result <= ERROR_DRM_VENDOR_MAX) {

            if (isCryptoError(result)) {

                reply->writeCString(errorDetailMsg.c_str());

            }