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

Widevine Version Number for NYC-MR1 am: 15ca8148a8 am: 08a706f1b0

Browse Source 
am: 3778d8218a

Change-Id: Ic91ea69f4e7c9e809ba8bba649540d1c04cd2485
This commit is contained in:
John "Juce" Bruce
2016-09-02 20:50:23 +00:00
committed by android-build-merger
parent 54be950b55 3778d8218a
commit 38eb094433
2 changed files with 4 additions and 5 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[] = "v4.0.0-android"; const char kWVCdmVersion[] = "v4.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];

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

@@ -3271,17 +3271,16 @@ 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("7.0", release_number) EXPECT_STREQ("7.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("v4.0.0-android", widevine_version) EXPECT_EQ("v4.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?";
} }
TEST_F(WvCdmRequestLicenseTest, AddHlsStreamingKeyTest) { TEST_F(WvCdmRequestLicenseTest, AddHlsStreamingKeyTest) {