NYC-MR2 Widevine Version Number Bump

(This is a merge of go/wvgerrit/22897)

Bumps the Widevine version to 4.2.0 for NYC-MR2 and also updates the
test to expect the NYC-MR2 OS version number.

Bug: 32955300
Test: request_license_test
Change-Id: I2f186928f20e0848cbeef5fef2182045ad27140a
This commit is contained in:
John W. Bruce
2017-01-05 15:50:31 -08:00
parent cc8d6942d6
commit 1b298c6ec7
2 changed files with 3 additions and 3 deletions

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?";
}