From 74a9f80790a4d5ba02748938fe0174d20ba42df7 Mon Sep 17 00:00:00 2001 From: Vicky Min Date: Mon, 15 May 2023 18:39:45 +0000 Subject: [PATCH] Fix oec session id in dynamic adpater [ Merge of http://go/wvgerrit/175310 ] Pass the real oemcrypto session id from `pair.session` instead of `session` for LoadEntitledContentKeys, since `session` can be changed when L1 and L3 are running in parallel and `session` in that case may not be the correct oemcrypto session id any more. Bug: 279967915, 282180589 Test: wvts Change-Id: I127ff37abf8b618dfbcb623f59bc999e58e7a028 --- libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp index 76b23896..5a955bba 100644 --- a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp +++ b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp @@ -2188,7 +2188,8 @@ extern "C" OEMCryptoResult OEMCrypto_LoadEntitledContentKeys( key_array_v16[i].content_key_data = key_array[i].content_key_data; } return pair.fcn->LoadEntitledContentKeys_V16( - session, message, message_length, key_array_length, &key_array_v16[0]); + pair.session, message, message_length, key_array_length, + &key_array_v16[0]); } if (pair.fcn->LoadEntitledContentKeys == nullptr) { return OEMCrypto_ERROR_NOT_IMPLEMENTED;