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

Commit 01f0a5a0 authored by Jeff Tinker's avatar Jeff Tinker
Browse files

Replace ICryptoPlugin's detailed error message 

It had been removed since it didn't appear to be needed,
but was found to be necessary for functionality.

Test: gtests pass

Change-Id: Ib716a04218e8d5c81f5d7889a53dfa17beccecef
related-to-bug: 32815560
parent b8e69a9d

drm/crypto/1.0/ICryptoPlugin.hal

+4 −1
Original line number Diff line number Diff line
@@ -83,9 +83,12 @@ interface ICryptoPlugin { 
     * ERROR_DRM_SESSION_NOT_OPENED if the decrypt session is not opened, or

     * ERROR_DRM_CANNOT_HANDLE in other failure cases.

     * @return bytesWritten the number of bytes output from the decryption

     * @return detailedError if the error is a vendor-specific error, the

     * vendor's crypto HAL may provide a detailed error string to help

     * describe the error.

     */

    decrypt(bool secure, uint8_t[16] keyId, uint8_t[16] iv, Mode mode,

        Pattern pattern, vec<SubSample> subSamples,

            memory source, DestinationBuffer destination)

        generates(Status status, uint32_t bytesWritten);

        generates(Status status, uint32_t bytesWritten, string detailedError);

};

drm/crypto/1.0/default/CryptoPlugin.cpp

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ namespace implementation { 
            bytesWritten = 0;

        }



        _hidl_cb(toStatus(status), bytesWritten);

        _hidl_cb(toStatus(status), bytesWritten, detailMessage.c_str());

        return Void();

    }