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

Modified return values for Restore operations

Browse Source 
[ Merge of http://go/wvgerrit/70543 ]

RestoreOfflineLicense and RestoreLicenseForRelease now return
CdmResponseType errors rather than a boolean. These error codes
can now be used when gathering metrics.

Bug: 115517916
Test: WV unit/integration tests
Change-Id: If4784d2cdd9825948c5dec31d3e60058ea06b61d
This commit is contained in:
Rahul Frias
2019-01-17 00:09:38 -08:00
parent cfe7221d9e
commit 675b934406
8 changed files with 159 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,14 +57,15 @@ class CdmLicense {
virtual CdmResponseType HandleEmbeddedKeyData(
const InitializationData& init_data);
virtual bool RestoreOfflineLicense(
virtual CdmResponseType RestoreOfflineLicense(
const CdmKeyMessage& license_request,
const CdmKeyResponse& license_response,
const CdmKeyResponse& license_renewal_response,
int64_t playback_start_time, int64_t last_playback_time,
int64_t grace_period_end_time, CdmSession* cdm_session);
virtual bool RestoreLicenseForRelease(const CdmKeyMessage& license_request,
const CdmKeyResponse& license_response);
virtual CdmResponseType RestoreLicenseForRelease(
const CdmKeyMessage& license_request,
const CdmKeyResponse& license_response);
virtual bool HasInitData() { return stored_init_data_.get(); }
virtual bool IsKeyLoaded(const KeyId& key_id);

13
libwvdrmengine/cdm/core/include/wv_cdm_types.h
View File

@@ -342,6 +342,19 @@ enum CdmResponseType {
GET_DECRYPT_HASH_ERROR = 297,
SESSION_NOT_FOUND_20 = 298,
INVALID_DECRYPT_HASH_FORMAT = 299,
EMPTY_LICENSE_REQUEST_2 = 300,
EMPTY_LICENSE_REQUEST_3 = 301,
EMPTY_LICENSE_RESPONSE_3 = 302,
EMPTY_LICENSE_RESPONSE_4 = 303,
PARSE_REQUEST_ERROR_1 = 304,
PARSE_REQUEST_ERROR_2 = 305,
INVALID_LICENSE_REQUEST_TYPE_1 = 306,
INVALID_LICENSE_REQUEST_TYPE_2 = 307,
LICENSE_RESPONSE_PARSE_ERROR_4 = 308,
LICENSE_RESPONSE_PARSE_ERROR_5 = 309,
INVALID_LICENSE_TYPE_2 = 310,
SIGNATURE_NOT_FOUND_2 = 311,
SESSION_KEYS_NOT_FOUND_2 = 312,
// Don't forget to add new values to ../test/test_printers.cpp.
};