From f7285fb0e9af34e22966b1dcd68db0e138244403 Mon Sep 17 00:00:00 2001
From: Robert Shih <robertshih@google.com>
Date: Fri, 19 Feb 2021 01:19:18 -0800
Subject: [PATCH 1/2] wvhidl: map wvcdm LogPriority to hidl LogPriority

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

Bug: 162255728
Test: VtsHalDrmV1_4TargetTest
Change-Id: I368b2d7a125e62e46ded322c1e171a15a9a7a1b4
---
 libwvdrmengine/include_hidl/TypeConvert.h | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/libwvdrmengine/include_hidl/TypeConvert.h b/libwvdrmengine/include_hidl/TypeConvert.h
index a01f1287..e98447e3 100644
--- a/libwvdrmengine/include_hidl/TypeConvert.h
+++ b/libwvdrmengine/include_hidl/TypeConvert.h
@@ -30,6 +30,24 @@ namespace drm {
 namespace V1_2 {
 namespace widevine {
 
+inline ::drm::V1_4::LogPriority toHidlPriority(wvcdm::LogPriority p) {
+  switch (p) {
+    case wvcdm::LogPriority::LOG_ERROR:
+      return ::drm::V1_4::LogPriority::ERROR;
+    case wvcdm::LogPriority::LOG_WARN:
+      return ::drm::V1_4::LogPriority::WARN;
+    case wvcdm::LogPriority::LOG_INFO:
+      return ::drm::V1_4::LogPriority::INFO;
+    case wvcdm::LogPriority::LOG_DEBUG:
+      return ::drm::V1_4::LogPriority::DEBUG;
+    case wvcdm::LogPriority::LOG_VERBOSE:
+      return ::drm::V1_4::LogPriority::VERBOSE;
+    default:
+      return ::drm::V1_4::LogPriority::UNKNOWN;
+  }
+  return ::drm::V1_4::LogPriority::UNKNOWN;
+}
+
 template<typename T, typename U>
 hidl_vec<T> toHidlVec(const std::vector<U> &vec);
 
@@ -40,7 +58,7 @@ inline hidl_vec<::drm::V1_4::LogMessage> toHidlVec(const std::vector<wvcdm::LogM
       const auto& msg = vec[i];
       hLogs[i] = {
           msg.time_ms_,
-          static_cast<::drm::V1_4::LogPriority>(msg.priority_),
+          toHidlPriority(msg.priority_),
           msg.message_,
       };
   }

From 00b4a9b5b5e42fb0de02ca5c637d4511c0177a78 Mon Sep 17 00:00:00 2001
From: Robert Shih <robertshih@google.com>
Date: Sun, 14 Feb 2021 09:37:28 +0000
Subject: [PATCH 2/2] OEMCrypto_LoadLicense doc cleanup

Bug: 162255728
Change-Id: I11f74b1f38e0e073e0e2e464bdce41e720f00549
---
 libwvdrmengine/oemcrypto/include/OEMCryptoCENC.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libwvdrmengine/oemcrypto/include/OEMCryptoCENC.h b/libwvdrmengine/oemcrypto/include/OEMCryptoCENC.h
index 874c2211..4bbdfa67 100644
--- a/libwvdrmengine/oemcrypto/include/OEMCryptoCENC.h
+++ b/libwvdrmengine/oemcrypto/include/OEMCryptoCENC.h
@@ -1667,7 +1667,6 @@ OEMCryptoResult OEMCrypto_LoadKeys(
  * @param[in] signature: pointer to memory containing the signature.
  * @param[in] signature_length: length of the signature, in bytes.
  *
- * @retval OEMCrypto_SUCCESS success OEMCrypto_ERROR_NO_DEVICE_KEY
  * @retval OEMCrypto_SUCCESS success
  * @retval OEMCrypto_ERROR_NO_DEVICE_KEY
  * @retval OEMCrypto_ERROR_INVALID_SESSION