From 93b5514a278d0d88bf86e5f0f44e4e590da08a42 Mon Sep 17 00:00:00 2001
From: Edwin <edwinwong@google.com>
Date: Mon, 14 Feb 2022 10:42:52 -0800
Subject: [PATCH] Fix gts issues.

Fix the conversion from in_args.keyId to Cdm format
which causes nullptr dereference signal 11 faults.

Test: atest
  atest-dev GtsMediaTestCases:com.google.android.media.gts.WidevineGenericOpsTests

Bug: 214410088
Change-Id: If84863e2501d4ccae7b8b38dceb707bb4bfa12fb
---
 libwvdrmengine/mediacrypto/aidl_src/WVCryptoPlugin.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libwvdrmengine/mediacrypto/aidl_src/WVCryptoPlugin.cpp b/libwvdrmengine/mediacrypto/aidl_src/WVCryptoPlugin.cpp
index 4e9a39d1..d2a26ef0 100644
--- a/libwvdrmengine/mediacrypto/aidl_src/WVCryptoPlugin.cpp
+++ b/libwvdrmengine/mediacrypto/aidl_src/WVCryptoPlugin.cpp
@@ -147,8 +147,7 @@ SharedBufferBase::~SharedBufferBase() {
   uint8_t* srcPtr = nullptr;
   void* destPtr = nullptr;
   // Convert parameters to the form the CDM wishes to consume them in.
-  const KeyId cryptoKey(reinterpret_cast<const char*>(in_args.keyId.data()),
-                        wvcdm::KEY_ID_SIZE);
+  const KeyId cryptoKey(in_args.keyId.begin(), in_args.keyId.end());
 
   // start scope for lock_guard
   {