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

Commit ad866fd0 authored by Greg Kaiser's avatar Greg Kaiser Committed by android-build-merger
Browse files

Merge "MockDrmCryptoPlugin: Don't truncate log output" am: 0e0e0819 

am: 3d065314

Change-Id: I4e7a7be5cc082ec5d3e5b1f8ca0842e1632b9bfb
parents 8e2e605e 3d065314

drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp

+5 −4
Original line number Diff line number Diff line
@@ -791,8 +791,9 @@ namespace android { 
    }



    ssize_t

    MockCryptoPlugin::decrypt(bool secure, const uint8_t key[16], const uint8_t iv[16],

            Mode mode, const Pattern &pattern, const void *srcPtr,

    MockCryptoPlugin::decrypt(bool secure, const uint8_t key[DECRYPT_KEY_SIZE],

            const uint8_t iv[DECRYPT_KEY_SIZE], Mode mode,

            const Pattern &pattern, const void *srcPtr,

            const SubSample *subSamples, size_t numSubSamples,

            void *dstPtr, AString * /* errorDetailMsg */)

    {
@@ -800,8 +801,8 @@ namespace android { 
              "pattern:{encryptBlocks=%d, skipBlocks=%d} src=%p, "

              "subSamples=%s, dst=%p)",

              (int)secure,

              arrayToString(key, sizeof(key)).string(),

              arrayToString(iv, sizeof(iv)).string(),

              arrayToString(key, DECRYPT_KEY_SIZE).string(),

              arrayToString(iv, DECRYPT_KEY_SIZE).string(),

              (int)mode, pattern.mEncryptBlocks, pattern.mSkipBlocks, srcPtr,

              subSamplesToString(subSamples, numSubSamples).string(),

              dstPtr);

drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.h

+5 −2
Original line number Diff line number Diff line
@@ -157,9 +157,12 @@ namespace android { 


        bool requiresSecureDecoderComponent(const char *mime) const;



        static constexpr size_t DECRYPT_KEY_SIZE = 16;



        ssize_t decrypt(bool secure,

            const uint8_t key[16], const uint8_t iv[16],

            Mode mode, const Pattern &pattern, const void *srcPtr,

            const uint8_t key[DECRYPT_KEY_SIZE],

            const uint8_t iv[DECRYPT_KEY_SIZE], Mode mode,

            const Pattern &pattern, const void *srcPtr,

            const SubSample *subSamples, size_t numSubSamples,

            void *dstPtr, AString *errorDetailMsg);

    private: