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

Merge "Avoid passing device ID when unused"

Browse Source
This commit is contained in:
Rahul Frias
2020-10-11 23:34:17 +00:00
committed by Android (Google) Code Review
parent 927c2f628b 0761dd8920
commit bab666ecdc
7 changed files with 32 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libwvdrmengine/cdm/core/include/client_identification.h
View File

@@ -26,10 +26,8 @@ class ClientIdentification {
// Use in conjunction with license requests
// |client_token| must be provided
// |device_id| optional
// |crypto_session| input parameter, mandatory
CdmResponseType Init(const std::string& client_token,
const std::string& device_id,
CryptoSession* crypto_session);
// Fill the ClientIdentification portion of the license or provisioning
@@ -53,7 +51,6 @@ class ClientIdentification {
bool is_license_request_;
std::string client_token_;
std::string device_id_;
CryptoSession* crypto_session_;
CORE_DISALLOW_COPY_AND_ASSIGN(ClientIdentification);

4
libwvdrmengine/cdm/core/include/license.h
View File

@@ -39,8 +39,7 @@ class CdmLicense {
virtual ~CdmLicense();
virtual bool Init(const std::string& client_token,
CdmClientTokenType client_token_type,
const std::string& device_id, bool use_privacy_mode,
CdmClientTokenType client_token_type, bool use_privacy_mode,
const std::string& signed_service_certificate,
CryptoSession* session, PolicyEngine* policy_engine);
@@ -140,7 +139,6 @@ class CdmLicense {
std::string server_url_;
std::string client_token_;
CdmClientTokenType client_token_type_;
std::string device_id_;
const CdmSessionId session_id_;
std::unique_ptr<InitializationData> stored_init_data_;
bool initialized_;