widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Widevine Android Version Number for M-MR1 (DO NOT MERGE)

Browse Source 
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
This commit is contained in:
John "Juce" Bruce
2015-10-27 11:03:20 -07:00
committed by John Bruce
parent d1b284b21c
commit c2ce8f974f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/cdm/src/properties_android.cpp
View File

@@ -18,7 +18,7 @@ const char kL2Dir[] = "/L2/";
const char kL3Dir[] = "/L3/"; const char kL3Dir[] = "/L3/";
const char kFactoryKeyboxPath[] = "/factory/wv.keys"; 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) { bool GetAndroidProperty(const char* key, std::string* value) {
char val[PROPERTY_VALUE_MAX]; char val[PROPERTY_VALUE_MAX];

4
libwvdrmengine/cdm/test/request_license_test.cpp
View File

@@ -2542,14 +2542,14 @@ TEST(VersionNumberTest, VersionNumberChangeCanary) {
char release_number[PROPERTY_VALUE_MAX]; char release_number[PROPERTY_VALUE_MAX];
ASSERT_GT(property_get("ro.build.version.release", release_number, "Unknown"), ASSERT_GT(property_get("ro.build.version.release", release_number, "Unknown"),
0); 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 " << "The Android version number has changed. You need to update this test "
"and also possibly update the Widevine version number in " "and also possibly update the Widevine version number in "
"properties_android.cpp."; "properties_android.cpp.";
std::string widevine_version; std::string widevine_version;
ASSERT_TRUE(Properties::GetWVCdmVersion(&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 " << "The Widevine CDM version number has changed. Did you forget to "
"update " "update "
"this test after changing it?"; "this test after changing it?";