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

Commit c6b74cbf authored by Robert Shih's avatar Robert Shih
Browse files

clearkey hidl: expand mock error handling 

* handle mock error for offline license APIs
* add mock INVALID_STATE and UNKNOWN errors

Bug: 118402843
Test: VtsHalDrmV1_2TargetTest
Change-Id: Id59610d44f5786b2bb030c46e41aaae3d6c5b954
parent 9821dd32

drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp

+14 −1
Original line number Diff line number Diff line
@@ -527,6 +527,10 @@ Return<Status> DrmPlugin::setPropertyString( 
            mMockError = Status_V1_2::ERROR_DRM_SESSION_LOST_STATE;

        } else if (value == kFrameTooLargeValue) {

            mMockError = Status_V1_2::ERROR_DRM_FRAME_TOO_LARGE;

        } else if (value == kInvalidStateValue)  {

            mMockError = Status_V1_2::ERROR_DRM_INVALID_STATE;

        } else {

            mMockError = Status_V1_2::ERROR_DRM_UNKNOWN;

        }

    }
@@ -683,6 +687,10 @@ Return<void> DrmPlugin::getMetrics(getMetrics_cb _hidl_cb) { 
Return<void> DrmPlugin::getOfflineLicenseKeySetIds(getOfflineLicenseKeySetIds_cb _hidl_cb) {

    std::vector<std::string> licenseNames = mFileHandle.ListLicenses();

    std::vector<KeySetId> keySetIds;

    if (mMockError != Status_V1_2::OK) {

        _hidl_cb(toStatus_1_0(mMockError), keySetIds);

        return Void();

    }

    for (const auto& name : licenseNames) {

        std::vector<uint8_t> keySetId(name.begin(), name.end());

        keySetIds.push_back(keySetId);
@@ -693,6 +701,9 @@ Return<void> DrmPlugin::getOfflineLicenseKeySetIds(getOfflineLicenseKeySetIds_cb 




Return<Status> DrmPlugin::removeOfflineLicense(const KeySetId& keySetId) {

    if (mMockError != Status_V1_2::OK) {

        return toStatus_1_0(mMockError);

    }

    std::string licenseName(keySetId.begin(), keySetId.end());

    if (mFileHandle.DeleteLicense(licenseName)) {

        return Status::OK;
@@ -706,7 +717,9 @@ Return<void> DrmPlugin::getOfflineLicenseState(const KeySetId& keySetId, 
    DeviceFiles::LicenseState state;

    std::string license;

    OfflineLicenseState hLicenseState;

    if (mFileHandle.RetrieveLicense(licenseName, &state, &license)) {

    if (mMockError != Status_V1_2::OK) {

        _hidl_cb(toStatus_1_0(mMockError), OfflineLicenseState::UNKNOWN);

    } else if (mFileHandle.RetrieveLicense(licenseName, &state, &license)) {

        switch (state) {

        case DeviceFiles::kLicenseStateActive:

            hLicenseState = OfflineLicenseState::USABLE;

drm/mediadrm/plugins/clearkey/hidl/include/ClearKeyDrmProperties.h

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ static const std::string kDrmErrorTestValue(""); 
static const std::string kResourceContentionValue("resourceContention");

static const std::string kLostStateValue("lostState");

static const std::string kFrameTooLargeValue("frameTooLarge");

static const std::string kInvalidStateValue("invalidState");



static const std::string kDeviceIdKey("deviceId");

static const uint8_t kTestDeviceIdData[] =