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

Merge "Sync Android CDM Version with OEMCrypto" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-16 19:37:51 +00:00
committed by Android (Google) Code Review
parent a6e8a38c20 376b96512f
commit d24ff56def
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/cdm/src/properties_android.cpp
View File

@@ -19,7 +19,7 @@ const char kL2Dir[] = "/L2/";
const char kL3Dir[] = "/L3/"; const char kL3Dir[] = "/L3/";
const char kFactoryKeyboxPath[] = "/factory/wv.keys"; const char kFactoryKeyboxPath[] = "/factory/wv.keys";
const char kWVCdmVersion[] = "v6.0.0-android"; const char kWVCdmVersion[] = "14.0.0";
bool GetAndroidProperty(const char* key, std::string* value) { bool GetAndroidProperty(const char* key, std::string* value) {
char val[PROPERTY_VALUE_MAX]; char val[PROPERTY_VALUE_MAX];

2
libwvdrmengine/cdm/test/request_license_test.cpp
View File

@@ -3806,7 +3806,7 @@ TEST(VersionNumberTest, VersionNumberChangeCanary) {
std::string widevine_version; std::string widevine_version;
ASSERT_TRUE(Properties::GetWVCdmVersion(&widevine_version)); ASSERT_TRUE(Properties::GetWVCdmVersion(&widevine_version));
EXPECT_EQ("v6.0.0-android", widevine_version) EXPECT_EQ("14.0.0", widevine_version)
<< "The Widevine CDM version number has changed. Did you forget to " << "The Widevine CDM version number has changed. Did you forget to "
"update this test after changing it?"; "update this test after changing it?";
} }