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

Merge "Return key request type none after key rotation" into qt-dev am: 999a466275 am: 4690da2bcb

Browse Source 
am: 4c9a3a6f02

Change-Id: Iddcac699401f64d920fcb8ff73053410019ec028
This commit is contained in:
Rahul Frias
2019-05-31 09:55:31 -07:00
committed by android-build-merger
parent ecf8a96970 4c9a3a6f02
commit 6c9c4697f0
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libwvdrmengine/cdm/core/src/cdm_session.cpp
View File

@@ -443,10 +443,14 @@ CdmResponseType CdmSession::GenerateKeyRequestInternal(
} else if (license_received_) {
// A call to GenerateKeyRequest after the initial license has been received
// is either a renewal/release request or a key rotation event
if (init_data.contains_entitled_keys())
if (init_data.contains_entitled_keys()) {
key_request->message.clear();
key_request->type = kKeyRequestTypeNone;
key_request->url.clear();
return license_parser_->HandleEmbeddedKeyData(init_data);
else
} else {
return GenerateRenewalRequest(key_request);
}
} else {
key_request->type = kKeyRequestTypeInitial;