From 0fc6e5a9b3447274dd4b1196dbbbfaee31fd0609 Mon Sep 17 00:00:00 2001 From: Rahul Frias Date: Sun, 21 Jan 2018 11:47:40 -0800 Subject: [PATCH] Update CDM version number for android Pi [ Merge of http://go/wvgerrit/41360 ] Bug: 72239183 Test: wv unit/integration tests on taimen. Change-Id: I7b093fbef6493e336e04f2b4eb162d5333636692 --- 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 84543e7c..1a84e64f 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.1.0-android"; +const char kWVCdmVersion[] = "v6.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 270c5e0a..86e46623 100644 --- a/libwvdrmengine/cdm/test/request_license_test.cpp +++ b/libwvdrmengine/cdm/test/request_license_test.cpp @@ -3545,14 +3545,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.1.0", release_number) + EXPECT_STREQ("P", 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.1.0-android", widevine_version) + EXPECT_EQ("v6.0.0-android", widevine_version) << "The Widevine CDM version number has changed. Did you forget to " "update this test after changing it?"; }