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

Merge "Reset UsageTableHeader when re-init for tests." into tm-dev

Browse Source
This commit is contained in:
Alex Dale
2022-04-01 21:13:32 +00:00
committed by Android (Google) Code Review
parent 0a65e3ba32 8091ed239e
commit b3a5a656af
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -374,15 +374,18 @@ void CryptoSession::Init() {
void CryptoSession::ReinitializeForTest() { void CryptoSession::ReinitializeForTest() {
if (initialized_) { if (initialized_) {
initialized_ = false; const OEMCryptoResult status = OEMCrypto_Terminate();
OEMCryptoResult status = OEMCrypto_Terminate();
if (OEMCrypto_SUCCESS != status) { if (OEMCrypto_SUCCESS != status) {
LOGE("OEMCrypto_Terminate failed: %d", status); LOGE("OEMCrypto_Terminate failed: %d", status);
return; return;
} }
initialized_ = false;
// Tables will be reinitialized by tests when needed.
usage_table_header_l1_.reset();
usage_table_header_l3_.reset();
} }
// Give up if we cannot initialize at all. // Give up if we cannot initialize at all.
OEMCryptoResult status = OEMCrypto_Initialize(); const OEMCryptoResult status = OEMCrypto_Initialize();
if (OEMCrypto_SUCCESS != status) { if (OEMCrypto_SUCCESS != status) {
LOGE("OEMCrypto_Initialize failed: %d", status); LOGE("OEMCrypto_Initialize failed: %d", status);
return; return;