From 9b7e2013d4b88f098a72c34040a365413c748149 Mon Sep 17 00:00:00 2001 From: Rahul Frias Date: Mon, 12 Nov 2018 15:08:02 -0800 Subject: [PATCH] Update WV build and android version number change canary [ Merge of http://go/wvgerrit/66145 ] Bug: 119431010 Test: WV unit/integration tests Change-Id: Ib869ee0df03dda6124ebcdb6ed8e502915ba9896 --- 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 d1828ebe..c791b501 100644 --- a/libwvdrmengine/cdm/src/properties_android.cpp +++ b/libwvdrmengine/cdm/src/properties_android.cpp @@ -21,7 +21,7 @@ const char kL2Dir[] = "/L2/"; const char kL3Dir[] = "/L3/"; const char kFactoryKeyboxPath[] = "/factory/wv.keys"; -const char kWVCdmVersion[] = "14.0.0"; +const char kWVCdmVersion[] = "15.0.0"; 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 203bbe0a..7867a003 100644 --- a/libwvdrmengine/cdm/test/request_license_test.cpp +++ b/libwvdrmengine/cdm/test/request_license_test.cpp @@ -4761,14 +4761,14 @@ TEST(VersionNumberTest, VersionNumberChangeCanary) { char release_number[PROPERTY_VALUE_MAX]; ASSERT_GT(property_get("ro.build.version.release", release_number, "Unknown"), 0); - EXPECT_STREQ("9", release_number) + EXPECT_STREQ("Q", 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("14.0.0", widevine_version) + EXPECT_EQ("15.0.0", widevine_version) << "The Widevine CDM version number has changed. Did you forget to " "update this test after changing it?"; }