Source release v2.1.2-0-773 + third_party libs

Change-Id: Ia07608577b65b301c22a8ff4bf7f743c2d3f9274

core/include/cdm_session.h

@@ -28,6 +28,8 @@ class CdmSession {
 
   CdmResponseType RestoreOfflineSession(const CdmKeySetId& key_set_id,
                                         const CdmLicenseType license_type);
+  CdmResponseType RestoreUsageSession(const CdmKeyMessage& key_request,
+                                      const CdmKeyResponse& key_response);
 
   void set_key_system(const CdmKeySystem& ksystem) { key_system_ = ksystem; }
   const CdmKeySystem& key_system() { return key_system_; }
@@ -86,6 +88,12 @@ class CdmSession {
   void OnKeyReleaseEvent(const CdmKeySetId& key_set_id);
 
   SecurityLevel GetRequestedSecurityLevel();
+  CdmSecurityLevel GetSecurityLevel();
+
+  CdmResponseType UpdateUsageInformation();
+
+  bool is_usage_update_needed() { return is_usage_update_needed_; }
+  void reset_is_usage_update_needed() { is_usage_update_needed_ = false; }
 
  private:
 
@@ -93,7 +101,9 @@ class CdmSession {
   CdmSessionId GenerateSessionId();
   bool GenerateKeySetId(CdmKeySetId* key_set_id);
 
+  CdmResponseType StoreLicense();
   bool StoreLicense(DeviceFiles::LicenseState state);
+  bool DeleteLicense();
 
   // instance variables
   const CdmSessionId session_id_;
@@ -103,13 +113,16 @@ class CdmSession {
   PolicyEngine policy_engine_;
   bool license_received_;
   bool reinitialize_session_;
+  bool is_offline_;
+  bool is_release_;
+  bool is_usage_update_needed_;
 
-  CdmLicenseType license_type_;
+  // information useful for offline and usage scenarios
+  CdmKeyMessage key_request_;
+  CdmKeyResponse key_response_;
 
   // license type offline related information
   CdmInitData offline_init_data_;
-  CdmKeyMessage offline_key_request_;
-  CdmKeyResponse offline_key_response_;
   CdmKeyMessage offline_key_renewal_request_;
   CdmKeyResponse offline_key_renewal_response_;
   std::string offline_release_server_url_;