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

Commit 54163af6 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Revert "Adapt to google::protobuf::uint64 type change"" am: 4d16ee4f 

am: 435f7eda

Change-Id: Ic68743522e67b8638481b1e4398a1fc19eb71d5b
parents acc9d5b8 435f7eda

drm/mediacas/plugins/clearkey/ClearKeyFetcher.cpp

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ status_t ClearKeyFetcher::ObtainKey(const sp<ABuffer>& buffer, 
    // asset_id change. If it sends an EcmContainer with 2 Ecms with different

    // asset_ids (old and new) then it might be best to prefetch the Emm.

    if ((asset_.id() != 0) && (*asset_id != asset_.id())) {

        ALOGW("Asset_id change from %" PRIu64 " to %" PRIu64, asset_.id(), *asset_id);

        ALOGW("Asset_id change from %llu to %" PRIu64, asset_.id(), *asset_id);

        asset_.Clear();

    }

drm/mediacas/plugins/clearkey/ecm.cpp

+1 −3
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
//#define LOG_NDEBUG 0

#define LOG_TAG "ecm"



#include <inttypes.h>



#include "ecm.h"

#include "ecm_generator.h"

#include "protos/license_protos.pb.h"
@@ -78,7 +76,7 @@ status_t Ecm::Decrypt( 
        return status;

    }

    if (asset.id() != asset_from_emm.id()) {

        ALOGE("Asset_id from Emm (%" PRIu64 ") does not match asset_id from Ecm (%" PRIu64 ").",

        ALOGE("Asset_id from Emm (%llu) does not match asset_id from Ecm (%llu).",

                asset_from_emm.id(), asset.id());

        return CLEARKEY_STATUS_INVALID_PARAMETER;

    }