Call SelectKey regardless of entitled key mapping am: fce75c295b

am: 09366bb6ce Change-Id: I9b73230d68eecf47dd5caab94100c5f9144e75da
2019-04-30 20:04:44 -07:00
parent eecfe492f9 09366bb6ce
commit cee0887d20
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(