Merge "Key Status should reflect key container security level" into qt-dev am: 80f5e283ad

am: 555d7cdc83 Change-Id: Ib3c97a96e8482fafc888d71780daa047cc6428ac
2019-05-13 09:49:24 -07:00
parent 878e39c740 555d7cdc83
commit f1bb063682
8 changed files with 621 additions and 412 deletions
--- a/libwvdrmengine/cdm/core/src/cdm_session.cpp
+++ b/libwvdrmengine/cdm/core/src/cdm_session.cpp
@@ -633,8 +633,7 @@ CdmResponseType CdmSession::Decrypt(const CdmDecryptionParameters& params) {
        return INSUFFICIENT_OUTPUT_PROTECTION;
      return NEED_KEY;
    }
-    if (!policy_engine_->CanUseKeyForSecurityLevel(*params.key_id,
-                                                   security_level_)) {
+    if (!policy_engine_->CanUseKeyForSecurityLevel(*params.key_id)) {
      return KEY_PROHIBITED_FOR_SECURITY_LEVEL;
    }
  }