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

Snap for 4562879 from e008a1e5d8 to pi-release

Browse Source 
Change-Id: Id1697b5b37edf73b38c893680f32875f6528727d
This commit is contained in:
android-build-team Robot
2018-01-24 08:21:14 +00:00
parent 5835977eb1 e008a1e5d8
commit 06a3903be9
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/cdm/core/src/cdm_session.cpp
View File

@@ -372,7 +372,7 @@ CdmResponseType CdmSession::GenerateKeyRequest(
init_data.type().c_str()); init_data.type().c_str());
return UNSUPPORTED_INIT_DATA; return UNSUPPORTED_INIT_DATA;
} }
if (init_data.IsEmpty()) { if (init_data.IsEmpty() && !license_parser_->HasInitData()) {
LOGW("CdmSession::GenerateKeyRequest: init data absent"); LOGW("CdmSession::GenerateKeyRequest: init data absent");
return INIT_DATA_NOT_FOUND; return INIT_DATA_NOT_FOUND;
} }

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];

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

@@ -1639,7 +1639,10 @@ TEST_F(WvCdmRequestLicenseTest, PrivacyModeTest) {
std::string resp = GetKeyRequestResponse(g_license_server, g_client_auth); std::string resp = GetKeyRequestResponse(g_license_server, g_client_auth);
EXPECT_EQ(decryptor_.AddKey(session_id_, resp, &key_set_id_), EXPECT_EQ(decryptor_.AddKey(session_id_, resp, &key_set_id_),
wvcdm::NEED_KEY); wvcdm::NEED_KEY);
GenerateKeyRequest(g_key_id, kLicenseTypeStreaming); const std::string empty_init_data;
// Verify cached initialization data from previous request is used when
// empty initialization data is passed.
GenerateKeyRequest(empty_init_data, kLicenseTypeStreaming);
VerifyKeyRequestResponse(g_license_server, g_client_auth); VerifyKeyRequestResponse(g_license_server, g_client_auth);
decryptor_.CloseSession(session_id_); decryptor_.CloseSession(session_id_);
} }
@@ -3545,14 +3548,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?";
} }

4
libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp
View File

@@ -923,14 +923,14 @@ void WVDrmPlugin::OnExpirationUpdate(const CdmSessionId& cdmSessionId,
status_t WVDrmPlugin::queryProperty(const std::string& property, status_t WVDrmPlugin::queryProperty(const std::string& property,
std::string& stringValue) const { std::string& stringValue) const {
SecurityLevel securityLevel = wvcdm::SecurityLevel securityLevel =
mPropertySet.security_level().compare(QUERY_VALUE_SECURITY_LEVEL_L3) == 0 mPropertySet.security_level().compare(QUERY_VALUE_SECURITY_LEVEL_L3) == 0
? kLevel3 ? kLevel3
: kLevelDefault; : kLevelDefault;
return queryProperty(securityLevel, property, stringValue); return queryProperty(securityLevel, property, stringValue);
} }
status_t WVDrmPlugin::queryProperty(SecurityLevel securityLevel, status_t WVDrmPlugin::queryProperty(wvcdm::SecurityLevel securityLevel,
const std::string& property, const std::string& property,
std::string& stringValue) const { std::string& stringValue) const {
CdmResponseType res = CdmResponseType res =