Fix session id in dynamic adapter and re-generate L3 am: 9651c61e25

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22953666

Change-Id: Ib37e118519e3d8021469dc5d87a065a520389b4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp

@@ -1191,14 +1191,14 @@ class Adapter {
     level3_.ReuseUsageEntry            = Level3_ReuseUsageEntry;
     level3_.GetDTCP2Capability         = Level3_GetDTCP2Capability;
     level3_.GetWatermarkingSupport     = Level3_GetWatermarkingSupport;
-    level3_.GetDeviceInformation      = nullptr;
-    level3_.GetDeviceSignedCsrPayload = nullptr;
-    level3_.GetKeyHandle              = nullptr;
-    level3_.DecryptCENC               = nullptr;
-    level3_.Generic_Encrypt           = nullptr;
-    level3_.Generic_Decrypt           = nullptr;
-    level3_.Generic_Sign              = nullptr;
-    level3_.Generic_Verify            = nullptr;
+    level3_.GetDeviceInformation      = Level3_GetDeviceInformation;
+    level3_.GetDeviceSignedCsrPayload = Level3_GetDeviceSignedCsrPayload;
+    level3_.GetKeyHandle              = Level3_GetKeyHandle;
+    level3_.DecryptCENC               = Level3_DecryptCENC;
+    level3_.Generic_Encrypt           = Level3_Generic_Encrypt;
+    level3_.Generic_Decrypt           = Level3_Generic_Decrypt;
+    level3_.Generic_Sign              = Level3_Generic_Sign;
+    level3_.Generic_Verify            = Level3_Generic_Verify;
     level3_.GetSignatureHashAlgorithm = nullptr;
     level3_.EnterTestMode             = nullptr;
     // clang-format on
@@ -2260,12 +2260,13 @@ extern "C" OEMCryptoResult OEMCrypto_GetKeyHandle(
     }
     *key_handle_length = handle_size;
     if (key_handle == nullptr) return OEMCrypto_ERROR_SHORT_BUFFER;
-    memcpy(key_handle, &session, handle_size);
+    memcpy(key_handle, &pair.session, handle_size);
     return pair.fcn->SelectKey(pair.session, content_key_id,
                                content_key_id_length, cipher_mode);
   }
-  return pair.fcn->GetKeyHandle(session, content_key_id, content_key_id_length,
-                                cipher_mode, key_handle, key_handle_length);
+  return pair.fcn->GetKeyHandle(pair.session, content_key_id,
+                                content_key_id_length, cipher_mode, key_handle,
+                                key_handle_length);
 }
 
 extern "C" OEMCryptoResult OEMCrypto_DecryptCENC(