From 15ca8148a85b8d7bba4c5a37b2681142f238f7e7 Mon Sep 17 00:00:00 2001 From: "John \"Juce\" Bruce" Date: Tue, 23 Aug 2016 15:34:39 -0700 Subject: [PATCH] Widevine Version Number for NYC-MR1 (This is a merge of go/wvgerrit/20402) This updates the version number to v4.1.0 for the NYC-MR1 release. It also updates the canary to pass on the nyc-mr1-dev branch. Bug: 30813903 Change-Id: I05de038ff52e9f7633efff7011052b48b59d90fa --- libwvdrmengine/cdm/src/properties_android.cpp | 2 +- libwvdrmengine/cdm/test/request_license_test.cpp | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libwvdrmengine/cdm/src/properties_android.cpp b/libwvdrmengine/cdm/src/properties_android.cpp index c2cc799e..9387ec18 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.0.0-android"; +const char kWVCdmVersion[] = "v4.1.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 6c5acd82..f9ecd604 100644 --- a/libwvdrmengine/cdm/test/request_license_test.cpp +++ b/libwvdrmengine/cdm/test/request_license_test.cpp @@ -3215,17 +3215,16 @@ TEST(VersionNumberTest, VersionNumberChangeCanary) { char release_number[PROPERTY_VALUE_MAX]; ASSERT_GT(property_get("ro.build.version.release", release_number, "Unknown"), 0); - EXPECT_STREQ("7.0", release_number) + EXPECT_STREQ("7.1", 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.0.0-android", widevine_version) + EXPECT_EQ("v4.1.0-android", widevine_version) << "The Widevine CDM version number has changed. Did you forget to " - "update " - "this test after changing it?"; + "update this test after changing it?"; } TEST_F(WvCdmRequestLicenseTest, AddHlsStreamingKeyTest) {