Merge "Added CDM support for Watermarking reporting." into tm-dev am: b3a5117b82 am: f0de58c431

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17364417

Change-Id: Ic8673e2b3ae269b71612f6bb6beed7d0e7a67579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libwvdrmengine/aidl_src/WVDrmFactory.cpp

@@ -239,6 +239,7 @@ void WVDrmFactory::printCdmProperties(int fd) {
       {"analog capabilities:", wvcdm::QUERY_KEY_ANALOG_OUTPUT_CAPABILITIES},
       {"can disable analog output:",
        wvcdm::QUERY_KEY_CAN_DISABLE_ANALOG_OUTPUT},
+      {"watermarking support:", wvcdm::QUERY_KEY_WATERMARKING_SUPPORT},
   };
 
   string value;

libwvdrmengine/aidl_src/wv_metrics.cpp

@@ -374,6 +374,9 @@ void FormatCryptoMetrics(const WvCdmMetrics_CryptoMetrics metrics,
   FORMAT_REPEATED_DISTRIBUTION(oemcrypto_load_provisioning_time_us, indent);
   FORMAT_OPTIONAL_VALUE(oemcrypto_minor_api_version, indent);
   FORMAT_OPTIONAL_VALUE(oemcrypto_maximum_usage_table_header_size, indent);
+
+  // OEMCrypto V17 metrics below.
+  FORMAT_OPTIONAL_VALUE(oemcrypto_watermarking_support, indent);
 }
 
 void FormatSessionMetrics(const WvCdmMetrics_SessionMetrics& metrics,