Merge cdm changes to android repo

Bug: 251924225 Test: GtsMediaTestCases Change-Id: I1b4e64c0abf701fe1f5017f14dc72b72c3ea6770
2022-10-07 23:55:37 +00:00
parent 3cfe7c7299
commit af0168dbed
54 changed files with 295536 additions and 294359 deletions
--- a/libwvdrmengine/oemcrypto/test/fuzz_tests/oemcrypto_fuzz_helper.h
+++ b/libwvdrmengine/oemcrypto/test/fuzz_tests/oemcrypto_fuzz_helper.h
@@ -52,6 +52,8 @@ class OEMCryptoLicenseAPIFuzz : public InitializeFuzz {

  Session* session() { return &session_; }

+  uint32_t session_id() { return session_.session_id(); }
+
  void LoadLicense();

 private: