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

Merge common code

Browse Source 
Merge from Widevine repo of http://go/wvgerrit/57720

Now that we have oemcrypto mock split into reference and testbed code, it is
time to remove the part of testbed that is an exact copy of the reference code
and just use the reference code.

Test: unit tests
Bug: 76393338
Change-Id: I3831a3f0118221c21ff1c28e6b6101b27b889012
This commit is contained in:
Fred Gylys-Colwell
2018-09-02 13:18:18 -07:00
parent 41917224f5
commit a0961a8834
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
View File

@@ -1063,7 +1063,7 @@ bool OEMCrypto_SupportsUsageTable(SecurityLevel level) {
const FunctionPointers* fcn = kAdapter->get(level);
if (!fcn) return false;
if (fcn->version == 8) return false;
if (fcn->SupportsUsageTable == NULL) return OEMCrypto_ERROR_NOT_IMPLEMENTED;
if (fcn->SupportsUsageTable == NULL) return false;
return fcn->SupportsUsageTable();
}
@@ -1072,8 +1072,7 @@ bool OEMCrypto_IsAntiRollbackHwPresent(SecurityLevel level) {
const FunctionPointers* fcn = kAdapter->get(level);
if (!fcn) return false;
if (fcn->version < 10) return false;
if (fcn->IsAntiRollbackHwPresent == NULL)
return OEMCrypto_ERROR_NOT_IMPLEMENTED;
if (fcn->IsAntiRollbackHwPresent == NULL) return false;
return fcn->IsAntiRollbackHwPresent();
}