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

Commit 2284fb80 authored by Robert Shih's avatar Robert Shih Committed by Gerrit Code Review
Browse files

Merge "Fix DrmMetricsLogger uuid copy size"

parents ea92d2c8 37c16998

drm/libmediadrm/DrmMetricsLogger.cpp

+6 −3
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ std::vector<uint8_t> toStdVec(Vector<uint8_t> const& sessionId) { 
    std::vector<uint8_t> vec(sessionKey, sessionKey + sessionId.size());

    return vec;

}



}  // namespace



DrmMetricsLogger::DrmMetricsLogger(IDrmFrontend frontend)
@@ -48,7 +49,8 @@ DrmStatus DrmMetricsLogger::initCheck() const { 
    return status;

}



DrmStatus DrmMetricsLogger::isCryptoSchemeSupported(const uint8_t uuid[16], const String8& mimeType,

DrmStatus DrmMetricsLogger::isCryptoSchemeSupported(const uint8_t uuid[IDRM_UUID_SIZE],

                                                    const String8& mimeType,

                                                    DrmPlugin::SecurityLevel securityLevel,

                                                    bool* result) {

    DrmStatus status = mImpl->isCryptoSchemeSupported(uuid, mimeType, securityLevel, result);
@@ -58,8 +60,9 @@ DrmStatus DrmMetricsLogger::isCryptoSchemeSupported(const uint8_t uuid[16], cons 
    return status;

}



DrmStatus DrmMetricsLogger::createPlugin(const uint8_t uuid[16], const String8& appPackageName) {

    std::memcpy(mUuid.data(), uuid, mUuid.size());

DrmStatus DrmMetricsLogger::createPlugin(const uint8_t uuid[IDRM_UUID_SIZE],

                                         const String8& appPackageName) {

    std::memcpy(mUuid.data(), uuid, IDRM_UUID_SIZE);

    if (kUuidSchemeMap.count(mUuid)) {

        mScheme = kUuidSchemeMap.at(mUuid);

    } else {

drm/libmediadrm/include/mediadrm/DrmMetricsLogger.h

+6 −3
Original line number Diff line number Diff line
@@ -39,10 +39,13 @@ class DrmMetricsLogger : public IDrm { 


    virtual DrmStatus initCheck() const;



    virtual DrmStatus isCryptoSchemeSupported(const uint8_t uuid[16], const String8& mimeType,

                                              DrmPlugin::SecurityLevel securityLevel, bool* result);

    virtual DrmStatus isCryptoSchemeSupported(const uint8_t uuid[IDRM_UUID_SIZE],

                                              const String8& mimeType,

                                              DrmPlugin::SecurityLevel securityLevel,

                                              bool* result);



    virtual DrmStatus createPlugin(const uint8_t uuid[16], const String8& appPackageName);

    virtual DrmStatus createPlugin(const uint8_t uuid[IDRM_UUID_SIZE],

                                   const String8& appPackageName);



    virtual DrmStatus destroyPlugin();

drm/libmediadrm/include/mediadrm/IDrm.h

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 


#define ANDROID_IDRM_H_



#define IDRM_UUID_SIZE (16)



namespace android {

namespace hardware {

namespace drm {