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

Merge "CryptoSession: Propagate err from GetSystemIdInternal in Open" into rvc-dev am: 4fe638a779 am: 5775aff942 am: d251cea528 am: b196554f90

Browse Source 
Change-Id: Ie324f4fc78d93efef42889cffdc98f9dfd34dc27
This commit is contained in:
TreeHugger Robot
2020-04-02 00:34:58 +00:00
committed by Automerger Merge Worker
parent b4477c75ed b196554f90
commit 09121feb52
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -748,12 +748,13 @@ CdmResponseType CryptoSession::Open(SecurityLevel requested_security_level) {
open_ = true;
// Get System ID and save it.
if (GetSystemIdInternal(&system_id_) == NO_ERROR) {
result = GetSystemIdInternal(&system_id_);
if (result == NO_ERROR) {
metrics_->crypto_session_system_id_.Record(system_id_);
} else {
LOGE("Failed to fetch system ID");
metrics_->crypto_session_system_id_.SetError(LOAD_SYSTEM_ID_ERROR);
return LOAD_SYSTEM_ID_ERROR;
metrics_->crypto_session_system_id_.SetError(result);
return result;
}
// Set up request ID