Call SelectKey regardless of entitled key mapping

am: fce75c295b Change-Id: Ibe1b1eefd267e875c16850c7910f26c3e413347a
2019-04-30 18:53:34 -07:00
parent b8d6b35385 fce75c295b
commit 09366bb6ce
1 changed files with 1 additions and 4 deletions
--- a/libwvdrmengine/cdm/core/src/entitlement_key_session.cpp
+++ b/libwvdrmengine/cdm/core/src/entitlement_key_session.cpp
@@ -75,11 +75,8 @@ OEMCryptoResult EntitlementKeySession::SelectKey(const std::string& key_id,

    current_loaded_content_keys_[entitled_content_key.entitlement_key_id()] =
        key_id;
-
-    return ContentKeySession::SelectKey(key_id, cipher_mode);
-  } else {
-    return OEMCrypto_SUCCESS;
  }
+  return ContentKeySession::SelectKey(key_id, cipher_mode);
 }

 OEMCrypto_EntitledContentKeyObject EntitlementKeySession::MakeOecEntitledKey(