Merge "Sync license_protocol.proto" into tm-dev

libwvdrmengine/cdm/core/src/license_protocol.proto

@@ -77,6 +77,12 @@ message LicenseIdentification {
   // which is from the LicenseRequest.request_time when set, or set by the
   // server to be the time that the original license was processed.
   optional int64 original_start_time_seconds = 9;
+  // Set by the SDK representing the renewal recovery duration from the initial
+  // license.
+  optional int64 original_renewal_recovery_duration_seconds = 10;
+  // Set by the SDK representing the renewal delay seconds from the original
+  // license.
+  optional int64 original_renewal_delay_seconds = 11;
 }
 
 // This message is used to indicate the license cateogry spec for a license as
@@ -163,8 +169,10 @@ message License {
     // specified URL.
     optional string renewal_server_url = 8;
 
-    // How many seconds after license_start_time, before renewal is first
-    // attempted.
+    // How many seconds after |license_start_time| before renewal is first
+    // attempted. If |renew_with_usage| is true in a new license, then this is
+    // the optional number of seconds after first playback, before renewal is
+    // first attempted.
     optional int64 renewal_delay_seconds = 9 [default = 0];
 
     // Specifies the delay in seconds between subsequent license
@@ -172,7 +180,8 @@ message License {
     optional int64 renewal_retry_interval_seconds = 10 [default = 0];
 
     // Indicates that the license shall be sent for renewal when usage is
-    // started.
+    // started, i.e. on first playback. This should only be used for a new
+    // license. The client shall ignore this if set in a renewal.
     optional bool renew_with_usage = 11 [default = false];
 
     // Indicates to client that license renewal and release requests ought to
@@ -181,10 +190,11 @@ message License {
 
     // Duration of grace period before playback_duration_seconds (short window)
     // goes into effect. Optional.
+    // Deprecated in V16.
     optional int64 play_start_grace_period_seconds = 13 [default = 0];
 
     // Enables "soft enforcement" of playback_duration_seconds, letting the user
-    // finish playback even if short window expires. Optional.
+    // finish playback even if playback window expires. Optional.
     optional bool soft_enforce_playback_duration = 14 [default = false];
 
     // Enables "soft enforcement" of rental_duration_seconds. Initial playback
@@ -277,6 +287,7 @@ message License {
         // allow use of the key anyway.
         CURRENT_SRM = 1;
       }
+
       optional HdcpSrmRule hdcp_srm_rule = 3 [default = HDCP_SRM_RULE_NONE];
       // Optional requirement to indicate analog output is not allowed.
       optional bool disable_analog_output = 4 [default = false];
@@ -365,7 +376,7 @@ message License {
   // LicenseRequest.request_time.  If this time is not set in the request,
   // the local time at the license service is used in this field.
   optional int64 license_start_time = 4;
-  // TODO(b/65054419): Deprecate remote_attestation_verified in favor of
+  // Deprecate remote_attestation_verified in favor of
   // platform_verification_status, below.
   optional bool remote_attestation_verified = 5 [default = false];
   // Client token generated by the content provider. Optional.
@@ -391,6 +402,9 @@ message License {
   // a license. It could be used as a part of initial license issuance or shown
   // as a part of license in license response.
   optional LicenseCategorySpec license_category_spec = 12;
+  // Optional: The provider key id indicates which provider key was used
+  // during provider key encryption.
+  optional uint32 provider_key_id = 13;
 }
 
 enum ProtocolVersion {