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

Set renewal_delay_base in function CreateCoreLicenseResponseFromProto

Browse Source 
PiperOrigin-RevId: 525261485
Merged from https://widevine-internal-review.googlesource.com/170810

Change-Id: I96f16639a728db9b6922d3f23e0212fa2902602e
This commit is contained in:
Vicky Min
2023-04-18 15:01:48 -07:00
committed by Robert Shih
parent 152f2144f9
commit f71014507d
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/oemcrypto/odk/include/odk_structs.h
View File

@@ -19,7 +19,7 @@ extern "C" {
#define ODK_MINOR_VERSION 2 #define ODK_MINOR_VERSION 2
/* ODK Version string. Date changed automatically on each release. */ /* ODK Version string. Date changed automatically on each release. */
#define ODK_RELEASE_DATE "ODK v18.2 2023-04-14" #define ODK_RELEASE_DATE "ODK v18.2 2023-04-18"
/* The lowest version number for an ODK message. */ /* The lowest version number for an ODK message. */
#define ODK_FIRST_VERSION 16 #define ODK_FIRST_VERSION 16

13
libwvdrmengine/oemcrypto/odk/src/core_message_serialize_proto.cpp
View File

@@ -147,6 +147,19 @@ bool CreateCoreLicenseResponseFromProto(const CoreMessageFeatures& features,
} }
parsed_lic.nonce_required = nonce_required; parsed_lic.nonce_required = nonce_required;
const auto& policy = lic.policy(); const auto& policy = lic.policy();
switch (policy.initial_renewal_delay_base()) {
case video_widevine::License_Policy::LICENSE_LOAD:
parsed_lic.renewal_delay_base = OEMCrypto_License_Load;
break;
case video_widevine::License_Policy::FIRST_DECRYPT:
parsed_lic.renewal_delay_base = OEMCrypto_First_Decrypt;
break;
case video_widevine::License_Policy::TIMER_DELAY_BASE_UNSPECIFIED:
case video_widevine::License_Policy::LICENSE_START:
default:
parsed_lic.renewal_delay_base = OEMCrypto_License_Start;
break;
}
ODK_TimerLimits& timer_limits = parsed_lic.timer_limits; ODK_TimerLimits& timer_limits = parsed_lic.timer_limits;
timer_limits.soft_enforce_rental_duration = timer_limits.soft_enforce_rental_duration =
policy.soft_enforce_rental_duration(); policy.soft_enforce_rental_duration();