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

Merge "Add API for device provisioning server certificate"

Browse Source
This commit is contained in:
Rahul Frias
2017-01-20 09:13:04 +00:00
committed by Android (Google) Code Review
parent f2832d5f21 2045316001
commit 98251f15d5
7 changed files with 62 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp
View File

@@ -209,6 +209,13 @@ class TestWvCdmClientPropertySet : public CdmClientPropertySet {
virtual void set_service_certificate(const std::string& cert) {
service_certificate_ = cert;
}
virtual const std::string& device_provisioning_service_certificate() const {
return device_provisioning_service_certificate_;
}
virtual void set_device_provisioning_service_certificate(
const std::string& cert) {
device_provisioning_service_certificate_ = cert;
}
virtual bool use_privacy_mode() const { return use_privacy_mode_; }
virtual bool is_session_sharing_enabled() const {
return is_session_sharing_enabled_;
@@ -234,6 +241,7 @@ class TestWvCdmClientPropertySet : public CdmClientPropertySet {
std::string app_id_;
std::string security_level_;
std::string service_certificate_;
std::string device_provisioning_service_certificate_;
bool use_privacy_mode_;
bool is_session_sharing_enabled_;
uint32_t session_sharing_id_;

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

@@ -889,6 +889,13 @@ class TestWvCdmClientPropertySet : public CdmClientPropertySet {
virtual void set_service_certificate(const std::string& cert) {
service_certificate_ = cert;
}
virtual const std::string& device_provisioning_service_certificate() const {
return device_provisioning_service_certificate_;
}
virtual void set_device_provisioning_service_certificate(
const std::string& cert) {
device_provisioning_service_certificate_ = cert;
}
virtual bool use_privacy_mode() const { return use_privacy_mode_; }
virtual bool is_session_sharing_enabled() const {
return is_session_sharing_enabled_;
@@ -914,6 +921,7 @@ class TestWvCdmClientPropertySet : public CdmClientPropertySet {
std::string app_id_;
std::string security_level_;
std::string service_certificate_;
std::string device_provisioning_service_certificate_;
bool use_privacy_mode_;
bool is_session_sharing_enabled_;
uint32_t session_sharing_id_;