From 07f40d1bedf46500dbb0e29699d7c5427f236328 Mon Sep 17 00:00:00 2001 From: Robert Shih Date: Thu, 26 Mar 2020 13:54:05 -0700 Subject: [PATCH] CryptoSession: Propagate err from `GetSystemIdInternal` in `Open` Merge of http://go/wvgerrit/96509 Bug: 151231204 Test: GtsMediaTestCases Change-Id: Ib29691fcea1c9d5fcfa981caf3e5bdab00cbb0bf --- libwvdrmengine/cdm/core/src/crypto_session.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libwvdrmengine/cdm/core/src/crypto_session.cpp b/libwvdrmengine/cdm/core/src/crypto_session.cpp index dee93007..c7fc91a2 100644 --- a/libwvdrmengine/cdm/core/src/crypto_session.cpp +++ b/libwvdrmengine/cdm/core/src/crypto_session.cpp @@ -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