Source release 18.1.0

metrics/src/Android.bp

@@ -22,6 +22,7 @@ package {
     // all of the 'license_kinds' from "vendor_widevine_license"
     // to get the below license kinds:
     //   legacy_by_exception_only (by exception only)
+    //   legacy_proprietary (by exception only)
     default_applicable_licenses: ["vendor_widevine_license"],
 }
 
@@ -65,4 +66,6 @@ cc_library {
         export_proto_headers: true,
         type: "full",
     },
+
+    min_sdk_version: "UpsideDownCake",
 }

metrics/src/attribute_handler.cpp

@@ -20,6 +20,13 @@ template <>
 void SetAttributeField<drm_metrics::Attributes::kErrorCodeFieldNumber,
                        CdmResponseType>(const CdmResponseType& cdm_error,
                                         drm_metrics::Attributes* attributes) {
+  attributes->set_error_code(cdm_error.code());
+}
+
+template <>
+void SetAttributeField<drm_metrics::Attributes::kErrorCodeFieldNumber,
+                       CdmResponseEnum>(const CdmResponseEnum& cdm_error,
+                                        drm_metrics::Attributes* attributes) {
   attributes->set_error_code(cdm_error);
 }
 
@@ -98,6 +105,15 @@ void SetAttributeField<drm_metrics::Attributes::kErrorDetailFieldNumber,
   attributes->set_error_detail(error_detail);
 }
 
+template <>
+void SetAttributeField<
+    drm_metrics::Attributes::kOemCryptoSignatureHashAlgorithmFieldNumber,
+    OEMCrypto_SignatureHashAlgorithm>(
+    const OEMCrypto_SignatureHashAlgorithm& algorithm,
+    drm_metrics::Attributes* attributes) {
+  attributes->set_oem_crypto_signature_hash_algorithm(algorithm);
+}
+
 template <>
 void SetAttributeField<0, util::Unused>(const util::Unused&,
                                         drm_metrics::Attributes*) {

metrics/src/metrics_collections.cpp

@@ -10,10 +10,7 @@
 
 namespace wvcdm {
 namespace metrics {
-using ::drm_metrics::Attributes;
 using ::drm_metrics::WvCdmMetrics;
-using ::google::protobuf::RepeatedPtrField;
-using ::wvcdm::metrics::EventMetric;
 namespace {
 // Helper struct for comparing session ids.
 struct CompareSessionIds {
@@ -161,8 +158,6 @@ void CryptoMetrics::Serialize(
       crypto_metrics->mutable_oemcrypto_rewrap_device_rsa_key_30_time_us());
   crypto_metrics->set_allocated_oemcrypto_security_patch_level(
       oemcrypto_security_patch_level_.ToProto());
-  oemcrypto_select_key_.ToProto(
-      crypto_metrics->mutable_oemcrypto_select_key_time_us());
   crypto_metrics->set_allocated_oemcrypto_usage_table_support(
       oemcrypto_usage_table_support_.ToProto());
   oemcrypto_update_usage_table_.ToProto(
@@ -213,9 +208,13 @@ void CryptoMetrics::Serialize(
       oemcrypto_watermarking_support_.ToProto());
   crypto_metrics->set_allocated_oemcrypto_production_readiness(
       oemcrypto_production_readiness_.ToProto());
+  oemcrypto_get_key_handle_.ToProto(
+      crypto_metrics->mutable_oemcrypto_get_key_handle_time_us());
+  oemcrypto_get_signature_hash_algorithm_.ToProto(
+      crypto_metrics->mutable_oemcrypto_get_signature_hash_algorithm());
 }
 
-SessionMetrics::SessionMetrics() : session_id_(""), completed_(false) {}
+SessionMetrics::SessionMetrics() : session_id_(), completed_(false) {}
 
 void SessionMetrics::Serialize(
     WvCdmMetrics::SessionMetrics* session_metrics) const {

metrics/src/wv_metrics.proto

@@ -49,6 +49,9 @@ message Attributes {
   optional uint32 license_type = 17;
   // Error detail supplemental to the error_code field.
   optional int32 error_detail = 18;
+  // The type of hashing algorithm used in signing with a private key. See
+  // OEMCrypto_SignatureHashAlgorithm in OEMCryptoCENC.h.
+  optional uint32 oem_crypto_signature_hash_algorithm = 19;
 }
 
 // The Counter message is used to store a count value with an associated
@@ -194,6 +197,8 @@ message WvCdmMetrics {
     optional ValueMetric oemcrypto_maximum_usage_table_header_size = 84;
     optional ValueMetric oemcrypto_watermarking_support = 85;
     optional ValueMetric oemcrypto_production_readiness = 86;
+    repeated DistributionMetric oemcrypto_get_key_handle_time_us = 87;
+    repeated CounterMetric oemcrypto_get_signature_hash_algorithm = 88;
   }
 
   // This contains metrics that were captured within a CdmSession. This contains