From 51944dc3313f333069079bf591e74d5eaa2e6551 Mon Sep 17 00:00:00 2001
From: Vicky Min <vickymin@google.com>
Date: Wed, 28 Aug 2024 17:22:40 +0000
Subject: [PATCH] Allow key_session to be set to oec_session when creating
 entitled key session

Bug: 358042250
Change-Id: If636f252aec6c95e23a91ee410f9cadf0ebad5d9
(cherry picked from commit 232d01b83abb6fe9ff9f4148bf79dc5dab8ee946)
---
 libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
index fba2ee09..5cfb47ac 100644
--- a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
+++ b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
@@ -1285,6 +1285,10 @@ class Adapter {
     OEMCryptoResult result =
         pair.fcn->CreateEntitledKeySession(pair.session, key_session);
     if (result == OEMCrypto_SUCCESS) {
+      if (pair.session == *key_session) {
+        *key_session = oec_session;
+        return result;
+      }
       // Copy everything from |pair| except session field.
       LevelSession new_session;
       new_session.fcn = pair.fcn;