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

Update CDM version number for android Pi

Browse Source 
[ Merge of http://go/wvgerrit/41360 ]

Bug: 72239183
Test: wv unit/integration tests on taimen.
Change-Id: I7b093fbef6493e336e04f2b4eb162d5333636692
This commit is contained in:
Rahul Frias
2018-01-21 11:47:40 -08:00
parent f8d114ad11
commit 0fc6e5a9b3
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

@@ -19,7 +19,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[] = "v5.1.0-android"; const char kWVCdmVersion[] = "v6.0.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

@@ -3545,14 +3545,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("8.1.0", release_number) EXPECT_STREQ("P", 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("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 " << "The Widevine CDM version number has changed. Did you forget to "
"update this test after changing it?"; "update this test after changing it?";
} }