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

NYC-MR2 Widevine Version Number Bump

Browse Source 
am: 1b298c6ec7

Change-Id: Ifa32ac7618652789acd9281cd5d2d9ba2eed8735
This commit is contained in:
John W. Bruce
2017-01-06 02:01:00 +00:00
committed by android-build-merger
parent b6c6ac8d5b 1b298c6ec7
commit 8309a406b3
2 changed files with 3 additions and 3 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 kFactoryKeyboxPath[] = "/factory/wv.keys";
const char kWVCdmVersion[] = "v4.1.0-android";
const char kWVCdmVersion[] = "v4.2.0-android";
bool GetAndroidProperty(const char* key, std::string* value) {
char val[PROPERTY_VALUE_MAX];

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

@@ -3410,14 +3410,14 @@ TEST(VersionNumberTest, VersionNumberChangeCanary) {
char release_number[PROPERTY_VALUE_MAX];
ASSERT_GT(property_get("ro.build.version.release", release_number, "Unknown"),
0);
EXPECT_STREQ("7.1.1", release_number)
EXPECT_STREQ("7.1.2", release_number)
<< "The Android version number has changed. You need to update this test "
"and also possibly update the Widevine version number in "
"properties_android.cpp.";
std::string widevine_version;
ASSERT_TRUE(Properties::GetWVCdmVersion(&widevine_version));
EXPECT_EQ("v4.1.0-android", widevine_version)
EXPECT_EQ("v4.2.0-android", widevine_version)
<< "The Widevine CDM version number has changed. Did you forget to "
"update this test after changing it?";
}