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

Browse Source 
am: 999a466275

Change-Id: Ic1546795d145988181e2a8eb6663a0b906b2617d
This commit is contained in:
Rahul Frias
2019-05-31 09:17:27 -07:00
committed by android-build-merger
parent bb4ffe8bdb 999a466275
commit 4c5cba3597
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/cdm/core/include/wv_cdm_types.h
View File

@@ -38,6 +38,8 @@ enum CdmKeyRequestType {
kKeyRequestTypeInitial,
kKeyRequestTypeRenewal,
kKeyRequestTypeRelease,
kKeyRequestTypeNone, // Keys are loaded and no license request is necessary
kKeyRequestTypeUpdate,
};
enum CdmOfflineLicenseState {

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

@@ -444,10 +444,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;

1
libwvdrmengine/cdm/test/request_license_test.cpp
View File

@@ -1785,6 +1785,7 @@ class WvCdmRequestLicenseTest : public WvCdmTestBase {
&key_request);
EXPECT_EQ(wvcdm::KEY_ADDED, status);
EXPECT_TRUE(key_request.message.empty());
EXPECT_EQ(kKeyRequestTypeNone, key_request.type);
EXPECT_TRUE(key_request.url.empty());
return wvcdm::KEY_ADDED == status && key_request.message.empty()
&& key_request.url.empty();

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

@@ -83,16 +83,15 @@ KeyRequestType ConvertFromCdmKeyRequestType(
KeyRequestType_V1_1 ConvertFromCdmKeyRequestType_1_1(
CdmKeyRequestType keyRequestType) {
/* TODO - What happened to these?
switch (keyRequestType) {
case wvcdm::kKeyRequestTypeNone:
return KeyRequestType_V1_1::NONE;
case wvcdm::kKeyRequestTypeUpdate:
return KeyRequestType_V1_1::UPDATE;
default:
*/
return static_cast<KeyRequestType_V1_1>(
ConvertFromCdmKeyRequestType(keyRequestType));
return static_cast<KeyRequestType_V1_1>(
ConvertFromCdmKeyRequestType(keyRequestType));
}
}
KeyRequestType toKeyRequestType_V1_0(KeyRequestType_V1_1 keyRequestType) {