From ce9c5f35acc7ac769c5b892cb3ce42fd3ef05919 Mon Sep 17 00:00:00 2001 From: "John W. Bruce" Date: Thu, 17 Aug 2017 02:42:54 -0700 Subject: [PATCH] Update Widevine Android Version Number to 5.1.0 (This is a merge from http://go/wvgerrit/31360) This also updates the version number change canary. Bug: 64209738 Test: request_license_test Change-Id: Ibdf27256822a32988a848ef5bf79bf2e2633fd59 --- 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 b0356485..4317f99a 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[] = "v5.0.0-android"; +const char kWVCdmVersion[] = "v5.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 40453700..3f4ebbe6 100644 --- a/libwvdrmengine/cdm/test/request_license_test.cpp +++ b/libwvdrmengine/cdm/test/request_license_test.cpp @@ -3726,14 +3726,14 @@ TEST(VersionNumberTest, VersionNumberChangeCanary) { char release_number[PROPERTY_VALUE_MAX]; ASSERT_GT(property_get("ro.build.version.release", release_number, "Unknown"), 0); - EXPECT_STREQ("8.0.0", release_number) + EXPECT_STREQ("OMR1", 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("v5.0.0-android", widevine_version) + EXPECT_EQ("v5.1.0-android", widevine_version) << "The Widevine CDM version number has changed. Did you forget to " "update this test after changing it?"; }