9935fae50d
This is a merge from: https://widevine-internal-review.googlesource.com/c/cdm/+/152372 The L3 source change which produced these libraries is: https://widevine-internal-review.googlesource.com/c/cdm/+/152371/ Original commit message: To address the bug with certain 16.4.x SDK versions returning a clear key control block (KCB) for clients newer than 16.5, the exact version check to determine whether key control blocks are clear or not has been loosened. Original behavior: - ODK version >= 16.5.x --> Assume clear - ODK version <= 16.4.x --> Assume encrypted New behavior: - No KCB IV --> Assume clear - Otherwise --> Assume encrypted This CL also includes a change to oemcrypto/include/OEMCryptoCENC.h The changes to OEMCryptoCENC.h in the CL are comments or variable name change. So it should be safe. This change was merged to wv tm-dev here: https://widevine-internal-review.googlesource.com/c/cdm/+/148411 So, adding it to Android tm-dev. Test: run_level3_static_tests, CdmDecryptTest/CdmTestWithDecryptParam.* against LS SDK 16.4.2 & 17.0 Bug: 232557453 Change-Id: I2bbb5ab3ea33a16bd6c198077e5aefe960737ea0