From b8049e1f20ea30644271a19a5dfbe2715be66f43 Mon Sep 17 00:00:00 2001
From: Rahul Frias <rfrias@google.com>
Date: Tue, 2 Mar 2021 02:48:10 -0800
Subject: [PATCH] Log license request and response

[ Merge of http://go/wvgerrit/119563 ]

This also increases the max log size from 1024 to 5120

Bug: 181642154
Test: WV unit/integration tests
Change-Id: Ifae90354dad1165f4d9fa3c9fe33a4dc14df1270
---
 libwvdrmengine/cdm/core/src/cdm_engine.cpp | 11 +++++++++++
 libwvdrmengine/cdm/util/src/log.cpp        |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/libwvdrmengine/cdm/core/src/cdm_engine.cpp b/libwvdrmengine/cdm/core/src/cdm_engine.cpp
index 2a71f0d2..aab679e9 100644
--- a/libwvdrmengine/cdm/core/src/cdm_engine.cpp
+++ b/libwvdrmengine/cdm/core/src/cdm_engine.cpp
@@ -304,6 +304,12 @@ CdmResponseType CdmEngine::GenerateKeyRequest(
     OnKeyReleaseEvent(key_set_id);
   }
 
+  LOGD(
+      "key request: (%zu) %s", key_request->message.size(),
+      wvcdm::Base64SafeEncode(std::vector<uint8_t>(key_request->message.begin(),
+                                                   key_request->message.end()))
+          .c_str());
+
   return KEY_MESSAGE;
 }
 
@@ -339,6 +345,11 @@ CdmResponseType CdmEngine::AddKey(const CdmSessionId& session_id,
     }
 
     id = iter->second.first;
+  } else {
+    LOGD("key data: (%zu) %s", key_data.size(),
+         wvcdm::Base64SafeEncode(
+             std::vector<uint8_t>(key_data.begin(), key_data.end()))
+             .c_str());
   }
 
   std::shared_ptr<CdmSession> session;
diff --git a/libwvdrmengine/cdm/util/src/log.cpp b/libwvdrmengine/cdm/util/src/log.cpp
index 830a4dad..fd3c888c 100644
--- a/libwvdrmengine/cdm/util/src/log.cpp
+++ b/libwvdrmengine/cdm/util/src/log.cpp
@@ -19,7 +19,7 @@
 #endif
 
 #define LOG_TAG "WVCdm"
-#define LOG_BUF_SIZE 1024
+#define LOG_BUF_SIZE 5120
 
 #include "log.h"
 #include <hwbinder/IPCThreadState.h>
@@ -83,7 +83,7 @@ void Log(const char* file, const char* function, int line, LogPriority level,
   const char* filename = strrchr(file, '/');
   filename = filename == nullptr ? file : filename + 1;
 
-  char buf[LOG_BUF_SIZE];
+  static thread_local char buf[LOG_BUF_SIZE];
   int len =
       snprintf(buf, LOG_BUF_SIZE, "[%s(%d):%s] ", filename, line, function);
   if (len < 0) len = 0;