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

Merge "Use requested_security_level_ in SupportsUsageTable"

Browse Source
This commit is contained in:
KongQun Yang
2015-03-18 22:40:17 +00:00
committed by Android (Google) Code Review
parent 46f26fe6ae 9ee523a3cd
commit ef04608109
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libwvdrmengine/cdm/core/src/crypto_session.cpp
View File

@@ -693,8 +693,7 @@ bool CryptoSession::UsageInformationSupport(bool* has_support) {
LOGV("UsageInformationSupport: id=%ld", (uint32_t)oec_session_id_); LOGV("UsageInformationSupport: id=%ld", (uint32_t)oec_session_id_);
if (!initialized_) return false; if (!initialized_) return false;
*has_support = OEMCrypto_SupportsUsageTable( *has_support = OEMCrypto_SupportsUsageTable(requested_security_level_);
kSecurityLevelL3 == GetSecurityLevel() ? kLevel3 : kLevelDefault);
return true; return true;
} }

2
libwvdrmengine/oemcrypto/mock/src/oemcrypto_mock.cpp
View File

@@ -487,7 +487,7 @@ OEMCryptoResult OEMCrypto_DecryptCTR(OEMCrypto_SESSION session,
bool is_encrypted, bool is_encrypted,
const uint8_t* iv, const uint8_t* iv,
size_t block_offset, size_t block_offset,
const OEMCrypto_DestBufferDesc* out_buffer, OEMCrypto_DestBufferDesc* out_buffer,
uint8_t subsample_flags) { uint8_t subsample_flags) {
if (LogCategoryEnabled(kLoggingTraceOEMCryptoCalls)) { if (LogCategoryEnabled(kLoggingTraceOEMCryptoCalls)) {
LOGI("-- OEMCryptoResult OEMCrypto_DecryptCTR" LOGI("-- OEMCryptoResult OEMCrypto_DecryptCTR"