From 1b298c6ec7f32e9e7e039bdc1c1189a9334aab9e Mon Sep 17 00:00:00 2001 From: "John W. Bruce" Date: Thu, 5 Jan 2017 15:50:31 -0800 Subject: [PATCH] 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 --- libwvdrmengine/cdm/src/properties_android.cpp | 2 +- libwvdrmengine/cdm/test/request_license_test.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libwvdrmengine/cdm/src/properties_android.cpp b/libwvdrmengine/cdm/src/properties_android.cpp index 9387ec18..9e6b608d 100644 --- a/libwvdrmengine/cdm/src/properties_android.cpp +++ b/libwvdrmengine/cdm/src/properties_android.cpp @@ -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]; diff --git a/libwvdrmengine/cdm/test/request_license_test.cpp b/libwvdrmengine/cdm/test/request_license_test.cpp index d9a84dfe..cebe23fd 100644 --- a/libwvdrmengine/cdm/test/request_license_test.cpp +++ b/libwvdrmengine/cdm/test/request_license_test.cpp @@ -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?"; }