Source release v2.1.6-0-824 + third_party libs

Change-Id: If190f81154326aa7dc22d66009687f389146ddfd

core/include/cdm_engine.h

@@ -49,7 +49,7 @@ class CdmEngine {
   virtual CdmResponseType RestoreKey(const CdmSessionId& session_id,
                                      const CdmKeySetId& key_set_id);
 
-  virtual CdmResponseType CancelKeyRequest(const CdmSessionId& session_id);
+  virtual CdmResponseType RemoveKeys(const CdmSessionId& session_id);
 
   // Construct valid renewal request for the current session keys.
   virtual CdmResponseType GenerateRenewalRequest(const CdmSessionId& session_id,

core/include/cdm_session.h

@@ -42,9 +42,6 @@ class CdmSession {
   virtual CdmResponseType AddKey(const CdmKeyResponse& key_response,
                                  CdmKeySetId* key_set_id);
 
-  // CancelKeyRequest() - Cancel session.
-  virtual CdmResponseType CancelKeyRequest();
-
   // Query session status
   virtual CdmResponseType QueryStatus(CdmQueryMap* key_info);
 
@@ -94,6 +91,13 @@ class CdmSession {
     is_usage_update_needed_ = false;
   }
 
+  // ReleaseCrypto() - Closes the underlying crypto session but leaves this
+  // object alive. It is invalid to call any method that requires a crypto
+  // session after calling this. Since calling this renders this object mostly
+  // useless, it is preferable to simply delete this object (which will also
+  // release the underlying crypto session) rather than call this method.
+  virtual CdmResponseType ReleaseCrypto();
+
  private:
   // Internal constructor
   void Create(CdmLicense* license_parser, CryptoSession* crypto_session,