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

Changed Widevine CDM version to "16.0.0".

Browse Source 
[ Merge of http://go/wvgerrit/83629 ]

In a previous change, the `VersionNumberChangeCanary` test started
to fail when Android changed their version number from "10" to "R".
I forgot to also change the Widevine CMD version string from "15.0.0"
to "16.0.0".

Test: Run `request_license_test` on Android
Bug: 137784842
Change-Id: I157aa6ac518423911e806b1278d723a86579c8cd
This commit is contained in:
Alex Dale
2019-07-25 13:58:07 -07:00
parent 510804a295
commit 0b3edf73a8
2 changed files with 3 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

@@ -21,7 +21,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[] = "15.0.0"; const char kWVCdmVersion[] = "16.0.0";
bool GetAndroidProperty(const char* key, std::string* value) { bool GetAndroidProperty(const char* key, std::string* value) {
if (!key) { if (!key) {

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

@@ -5553,6 +5553,7 @@ TEST(VersionNumberTest, VersionNumberChangeCanary) {
std::string release_number = std::string release_number =
android::base::GetProperty("ro.build.version.release", ""); android::base::GetProperty("ro.build.version.release", "");
ASSERT_TRUE(release_number.size() > 0); ASSERT_TRUE(release_number.size() > 0);
// Reminder to change the Widevine CDM version number.
EXPECT_STREQ("R", release_number.c_str()) EXPECT_STREQ("R", release_number.c_str())
<< "The Android version number has changed. You need to update this test " << "The Android version number has changed. You need to update this test "
"and also possibly update the Widevine version number in " "and also possibly update the Widevine version number in "
@@ -5560,7 +5561,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("15.0.0", widevine_version) EXPECT_EQ("16.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?";
} }