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

Merge "Additional merges from cdm master"

Browse Source
This commit is contained in:
Rahul Frias
2015-10-07 20:42:38 +00:00
committed by Android (Google) Code Review
parent ad3908e731 0fe3f79cc3
commit 72e4a10a8b
10 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -457,8 +457,8 @@ class TestWvCdmClientPropertySet : public CdmClientPropertySet {
virtual const std::string& service_certificate() const {
return service_certificate_;
}
virtual void set_service_certificate(const std::string& service_certificate) {
service_certificate_ = service_certificate;
virtual void set_service_certificate(const std::string& cert) {
service_certificate_ = cert;
}
virtual bool use_privacy_mode() const { return use_privacy_mode_; }
virtual bool is_session_sharing_enabled() const {
@@ -980,7 +980,7 @@ TEST_F(WvCdmRequestLicenseTest, PropertySetTest) {
itr = query_info.find(wvcdm::QUERY_KEY_SECURITY_LEVEL);
EXPECT_TRUE(itr != query_info.end());
security_level = itr->second;
EXPECT_TRUE(security_level.empty() ||
EXPECT_TRUE(!security_level.compare(QUERY_VALUE_SECURITY_LEVEL_L1) ||
!security_level.compare(QUERY_VALUE_SECURITY_LEVEL_L3));
std::string app_id = "not empty";