Merge "Correction to logging when SRM version is queried"

2019-02-27 21:48:06 +00:00
parent 99cea1b363 4916cb1e9c
commit e67d87bec1
4 changed files with 18 additions and 1 deletions
--- a/libwvdrmengine/cdm/core/src/crypto_session.cpp
+++ b/libwvdrmengine/cdm/core/src/crypto_session.cpp
@@ -1937,6 +1937,14 @@ CdmResponseType CryptoSession::GetSrmVersion(uint16_t* srm_version) {
    status = OEMCrypto_GetCurrentSRMVersion(srm_version);
  });

+  // SRM is an optional feature. Whether it is implemented is up to the
+  // discretion of OEMs
+  if (status == OEMCrypto_ERROR_NOT_IMPLEMENTED) {
+    LOGV("CryptoSession::GetSrmVersion: OEMCrypto_GetCurrentSRMVersion not "
+         "implemented");
+    return NOT_IMPLEMENTED_ERROR;
+  }
+
  return MapOEMCryptoResult(
      status, GET_SRM_VERSION_ERROR, "GetCurrentSRMVersion");
 }