Merge "Address request license test failures [ DO NOT MERGE ]" into qt-dev

This commit is contained in:
Rahul Frias
2019-06-02 00:44:31 +00:00
committed by Android (Google) Code Review
2 changed files with 8 additions and 32 deletions

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.