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

Merge latest oemcrypto-v17 change

Browse Source 
No-Typo-Check: Not related to this change.

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64
This commit is contained in:
Kyle Zhang
2022-01-21 05:58:12 +00:00
committed by Fred Gylys-Colwell
parent c924960962
commit 642965c678
176 changed files with 301013 additions and 296749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/cdm/include/cdm_identifier.h
View File

@@ -90,7 +90,7 @@ inline bool operator>=(const CdmIdentifier& lhs, const CdmIdentifier& rhs) {
// Provide default
static const CdmIdentifier kDefaultCdmIdentifier = {
EMPTY_SPOID, EMPTY_ORIGIN, EMPTY_APP_PACKAGE_NAME, 0, UNKNOWN_UID};
EMPTY_SPOID, EMPTY_ORIGIN, EMPTY_APP_PACKAGE_NAME, 0, wvutil::UNKNOWN_UID};
} // namespace wvcdm

2
libwvdrmengine/cdm/include/wv_android_constants.h
View File

@@ -9,6 +9,8 @@
namespace wvcdm {
// Note: If you change this, make sure you also change
// https://developers.google.com/widevine/drm/client/oemcrypto/compatibility
static const std::string kWVAndroidCdmVersion = "17.0.0";
} // namespace wvcdm

2
libwvdrmengine/cdm/include/wv_content_decryption_module.h
View File

@@ -201,7 +201,7 @@ class WvContentDecryptionModule : public android::RefBase, public TimerHandler {
struct CdmInfo {
CdmInfo();
FileSystem file_system;
wvutil::FileSystem file_system;
std::unique_ptr<CdmEngine> cdm_engine;
};