Snap for 7163758 from 82b5bc00cb to tm-release

Change-Id: Ie97e18b1758f52289e79a7008aa30f7fdf4d9f0a

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_,
       };
   }

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