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

Address request license test failures [ DO NOT MERGE ]

Browse Source 
[ Merge of http://go/wvgerrit/79883 ]

This corrects test code and undoes CE CDM changes in b/113167010 which
will be resolved in a future release.

The tests failures addressed are
* ProvisioningTestWithServiceCertificate
* ReleaseRetryOfflineKeyTest
* ReleaseRetryL3OfflineKeyTest
* ReleaseRetryL3OfflineKeySessionUsageDisable

ProvisioningInterspersedRetryTest has been disabled and will be
addressed in a post 15.2 OEMCrypto release in 133641240

Bug: 119428680
Test: WV unit/integration tests
Change-Id: I7961b4556a0ac749e4f38d43f1bea8f520d67f20
This commit is contained in:
Rahul Frias
2019-05-27 02:46:47 -07:00
parent f246f028b2
commit b7c6f9b52c
2 changed files with 8 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -243,11 +243,14 @@ CdmResponseType CdmSession::RestoreOfflineSession(
: GET_LICENSE_ERROR;
}
// TODO(rfrias, juce) b/133684744: Comment out this functionality to address
// android test failures. These changes were introduced to address
// b/113167010 (3c23a071e)
// Attempts to restore a released offline license are treated as a release
// retry.
if (license_state == DeviceFiles::kLicenseStateReleasing) {
license_type = kLicenseTypeRelease;
}
//if (license_state == DeviceFiles::kLicenseStateReleasing) {
// license_type = kLicenseTypeRelease;
//}
// Only restore offline licenses if they are active or this is a release
// retry.