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

Pick widevine oemcrypto-v18 change

Browse Source 
No-Typo-Check: From a third party header file
Bug: 260918793
Test: unit tests
Test: atp v2/widevine-eng/drm_compliance
Change-Id: I36effd6a10a99bdb2399ab1f4a0fad026d607c70
This commit is contained in:
Kyle Zhang
2022-12-16 03:21:08 +00:00
parent 4586522c07
commit 11255b7426
105 changed files with 324641 additions and 299787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libwvdrmengine/cdm/metrics/include/metrics_collections.h
View File

@@ -89,6 +89,8 @@ const int kKeyRequestTypeFieldNumber =
::drm_metrics::Attributes::kKeyRequestTypeFieldNumber;
const int kLicenseTypeFieldNumber =
::drm_metrics::Attributes::kLicenseTypeFieldNumber;
const int kOemCryptoSignatureHashAlgorithmFieldNumber =
::drm_metrics::Attributes::kOemCryptoSignatureHashAlgorithmFieldNumber;
} // namespace
// The maximum number of completed sessions that can be stored. More than this
@@ -252,8 +254,6 @@ class CryptoMetrics {
EventMetric<kOemCryptoResultFieldNumber, OEMCryptoResult>
oemcrypto_rewrap_device_rsa_key_30_;
ValueMetric<uint16_t> oemcrypto_security_patch_level_;
EventMetric<kOemCryptoResultFieldNumber, OEMCryptoResult>
oemcrypto_select_key_;
ValueMetric<CdmUsageSupportType> oemcrypto_usage_table_support_;
CounterMetric<kOemCryptoResultFieldNumber, OEMCryptoResult>
oemcrypto_update_usage_table_;
@@ -299,6 +299,12 @@ class CryptoMetrics {
oemcrypto_install_oem_private_key_;
ValueMetric<int> oemcrypto_watermarking_support_;
ValueMetric<int> oemcrypto_production_readiness_;
EventMetric<kOemCryptoResultFieldNumber, OEMCryptoResult>
oemcrypto_get_key_handle_;
CounterMetric<kOemCryptoResultFieldNumber, OEMCryptoResult,
kOemCryptoSignatureHashAlgorithmFieldNumber,
OEMCrypto_SignatureHashAlgorithm>
oemcrypto_get_signature_hash_algorithm_;
}; // class CryptoMetrics
// This class contains session-scoped metrics. All properties and