diff --git a/libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp b/libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp index 3066601e..079721fd 100644 --- a/libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp +++ b/libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp @@ -34,6 +34,7 @@ static const char* const kDisable = "disable"; static const std::string kPsshTag = "pssh"; static const char* const kSpecialUnprovisionResponse = "unprovision"; static const std::string kKeyAppPackageName = "application_name"; +static const std::string kKeyOrigin = "origin"; } // namespace @@ -520,9 +521,11 @@ Return WVDrmPlugin::getKeyRequest_1_2( cdmParameters[cdmKey] = cdmValue; } - // Inserting application name into parameters. This will overwrite user - // parameters of the same key. + // Inserting additional client ID parameters here, this will appear + // in the license request. + // Note: This will overwrite user parameters of the same key. cdmParameters[kKeyAppPackageName] = mAppPackageName; + cdmParameters[kKeyOrigin] = mCdmIdentifierBuilder.origin(); CdmKeyRequest keyRequest; CdmResponseType res = mCDM->GenerateKeyRequest( @@ -2122,12 +2125,9 @@ Status WVDrmPlugin::unprovision(const CdmIdentifier& identifier) { CdmResponseType res1 = mCDM->Unprovision(wvcdm::kSecurityLevelL1, identifier); CdmResponseType res3 = mCDM->Unprovision(wvcdm::kSecurityLevelL3, identifier); - if (!isCdmResponseTypeSuccess(res1)) - { + if (!isCdmResponseTypeSuccess(res1)) { return mapCdmResponseType(res1); - } - else - { + } else { return mapCdmResponseType(res3); } }