widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Include "origin" in license request client ID"

Browse Source
This commit is contained in:
Alex Dale
2020-11-03 00:52:45 +00:00
committed by Android (Google) Code Review
parent 37be367712 4028784836
commit cbb1d11a72
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp
View File

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