From c2ce8f974ffe45dd8af2b4e35480ea5f6646b816 Mon Sep 17 00:00:00 2001 From: "John \"Juce\" Bruce" Date: Tue, 27 Oct 2015 11:03:20 -0700 Subject: [PATCH] Update Widevine Android Version Number for M-MR1 (DO NOT MERGE) This updates Widevine's version number (and our canary test) for M-MR1. Widevine will report its version as 3.1.0 instead of 3.0.0, in order to distinguish it from the version released with Android M. Bug: 25297264 Change-Id: I79c53b2d1a63753bce2aa5a77c46543c2804d95e --- 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 97567742..79199d1c 100644 --- a/libwvdrmengine/cdm/src/properties_android.cpp +++ b/libwvdrmengine/cdm/src/properties_android.cpp @@ -18,7 +18,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[] = "v3.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 f4a6534f..2cbe5023 100644 --- a/libwvdrmengine/cdm/test/request_license_test.cpp +++ b/libwvdrmengine/cdm/test/request_license_test.cpp @@ -2542,14 +2542,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("6.0.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("v3.0.0-android", widevine_version) + EXPECT_EQ("v3.1.0-android", widevine_version) << "The Widevine CDM version number has changed. Did you forget to " "update " "this test after changing it?";