From 64ad54fdb0d0b0728726252ce4091cd911d43d8c Mon Sep 17 00:00:00 2001 From: "John \"Juce\" Bruce" Date: Fri, 23 Oct 2015 15:10:19 -0700 Subject: [PATCH] Update Widevine Android Version Number to 4.0 (This is a merge of http://go/wvgerrit/15992) This also updates the canary so that it will be silent on master. Bug: 25153516 Change-Id: I11163c98230c5a521609b5556b139f4508996858 --- 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 6753f39b..c2cc799e 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[] = "v3.0.0-android"; +const char kWVCdmVersion[] = "v4.0.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 5315247b..887f9004 100644 --- a/libwvdrmengine/cdm/test/request_license_test.cpp +++ b/libwvdrmengine/cdm/test/request_license_test.cpp @@ -2733,14 +2733,14 @@ TEST(VersionNumberTest, VersionNumberChangeCanary) { char release_number[PROPERTY_VALUE_MAX]; ASSERT_GT(property_get("ro.build.version.release", release_number, "Unknown"), 0); - EXPECT_STREQ("6.0", release_number) + EXPECT_STREQ("NYC", 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("v3.0.0-android", widevine_version) + EXPECT_EQ("v4.0.0-android", widevine_version) << "The Widevine CDM version number has changed. Did you forget to " "update " "this test after changing it?";