Revert "Detect when unable to meet policy requirements"

This reverts commit 1223330ccc.

b/37460568

Change-Id: I936c06f679126ac50fb2d4753b4270b4ba42def5

libwvdrmengine/cdm/core/include/policy_engine.h

@@ -34,10 +34,6 @@ class PolicyEngine {
   // status is not calculated to avoid overhead in the decryption path.
   virtual bool CanDecryptContent(const KeyId& key_id);
 
-  // Verifies whether the policy allows use of the specified key of
-  // a given security level for content decryption.
-  virtual bool CanUseKey(const KeyId& key_id, CdmSecurityLevel security_level);
-
   // OnTimerEvent is called when a timer fires. It notifies the Policy Engine
   // that the timer has fired and dispatches the relevant events through
   // |event_listener_|.

libwvdrmengine/cdm/core/include/wv_cdm_types.h

@@ -295,7 +295,6 @@ enum CdmResponseType {
   RELEASE_USAGE_INFO_FAILED,
   INCORRECT_USAGE_SUPPORT_TYPE_1,
   INCORRECT_USAGE_SUPPORT_TYPE_2, /* 255 */
-  KEY_PROHIBITED_FOR_SECURITY_LEVEL,
 };
 
 enum CdmKeyStatus {
@@ -393,16 +392,6 @@ struct CdmUsageEntryInfo {
   std::string usage_info_file_name;
 };
 
-enum CdmKeySecurityLevel {
-  kKeySecurityLevelUnset,
-  kSoftwareSecureCrypto,
-  kSoftwareSecureDecode,
-  kHardwareSecureCrypto,
-  kHardwareSecureDecode,
-  kHardwareSecureAll,
-  kKeySecurityLevelUnknown,
-};
-
 class CdmKeyAllowedUsage {
  public:
   CdmKeyAllowedUsage() {
@@ -419,7 +408,6 @@ class CdmKeyAllowedUsage {
     generic_decrypt = false;
     generic_sign = false;
     generic_verify = false;
-    key_security_level_ = kKeySecurityLevelUnset;
     valid_ = false;
   }
 
@@ -430,8 +418,7 @@ class CdmKeyAllowedUsage {
         generic_encrypt != other.generic_encrypt ||
         generic_decrypt != other.generic_decrypt ||
         generic_sign != other.generic_sign ||
-        generic_verify != other.generic_verify ||
-        key_security_level_ != other.key_security_level_) {
+        generic_verify != other.generic_verify) {
       return false;
     }
     return true;
@@ -443,7 +430,6 @@ class CdmKeyAllowedUsage {
   bool generic_decrypt;
   bool generic_sign;
   bool generic_verify;
-  CdmKeySecurityLevel key_security_level_;
 
  private:
   bool valid_;