From 315bf42c4feec4e1516fc2e056f9c5a1c22c08c6 Mon Sep 17 00:00:00 2001 From: Rahul Frias Date: Mon, 7 Sep 2020 18:38:40 -0700 Subject: [PATCH] Do not store information for kLicenseTypeTemporary [ Merge of http://go/wvgerrit/105624 ] Temporary licenses do not allow for license information to be stored in any form, whether it is usage information or persisting license information. Information should not be stored even if can_persist is set to true and a PST is specified as those are suggestions rather than a requirement. Bug: 167684104 Test: WV unit/integration tests Change-Id: I141a2bd5de4d86f0e5f31fc8f0ea9e20710d6469 --- libwvdrmengine/cdm/core/src/cdm_session.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libwvdrmengine/cdm/core/src/cdm_session.cpp b/libwvdrmengine/cdm/core/src/cdm_session.cpp index 11c0b178..8d06e6ee 100644 --- a/libwvdrmengine/cdm/core/src/cdm_session.cpp +++ b/libwvdrmengine/cdm/core/src/cdm_session.cpp @@ -485,6 +485,7 @@ CdmResponseType CdmSession::GenerateKeyRequestInternal( switch (license_type) { case kLicenseTypeTemporary: is_temporary_ = true; + is_offline_ = false; break; case kLicenseTypeStreaming: is_offline_ = false; @@ -625,7 +626,7 @@ CdmResponseType CdmSession::AddKeyInternal(const CdmKeyResponse& key_response) { license_parser_->provider_session_token().c_str(), license_parser_->provider_session_token().size()); - if (is_offline_ || has_provider_session_token()) { + if ((is_offline_ || has_provider_session_token()) && !is_temporary_) { if (has_provider_session_token() && usage_support_type_ == kUsageEntrySupport && usage_table_header_ != nullptr) {