Merge "Merge CE Device Changes"

libwvdrmengine/cdm/core/include/cdm_session.h

@@ -104,6 +104,8 @@ class CdmSession {
 
   virtual bool is_release() { return is_release_; }
   virtual bool is_offline() { return is_offline_; }
+  virtual bool is_temporary() { return is_temporary_; }
+  virtual bool license_received() { return license_received_; }
 
   // ReleaseCrypto() - Closes the underlying crypto session but leaves this
   // object alive. It is invalid to call any method that requires a crypto
@@ -141,6 +143,7 @@ class CdmSession {
   bool license_received_;
   bool is_offline_;
   bool is_release_;
+  bool is_temporary_;
   CdmSecurityLevel security_level_;
   SecurityLevel requested_security_level_;
   CdmAppParameterMap app_parameters_;

libwvdrmengine/cdm/core/include/device_files.h

@@ -67,6 +67,7 @@ class DeviceFiles {
   virtual bool DeleteAllLicenses();
   virtual bool LicenseExists(const std::string& key_set_id);
   virtual bool ReserveLicenseId(const std::string& key_set_id);
+  virtual bool UnreserveLicenseId(const std::string& key_set_id);
 
   virtual bool StoreUsageInfo(const std::string& provider_session_token,
                               const CdmKeyMessage& key_request,

libwvdrmengine/cdm/core/include/license.h

@@ -56,6 +56,10 @@ class CdmLicense {
     return provider_session_token_;
   }
 
+  virtual bool is_offline() {
+    return is_offline_;
+  }
+
   static CdmResponseType VerifySignedServiceCertificate(
       const std::string& signed_service_certificate);
 
@@ -89,6 +93,7 @@ class CdmLicense {
   std::set<KeyId> loaded_keys_;
   std::string provider_session_token_;
   bool renew_with_client_id_;
+  bool is_offline_;
 
   // Used for certificate based licensing
   CdmKeyMessage key_request_;

libwvdrmengine/cdm/core/include/wv_cdm_types.h

@@ -207,6 +207,8 @@ enum CdmResponseType {
   DUPLICATE_SESSION_ID_SPECIFIED,
   LICENSE_RENEWAL_PROHIBITED,
   EMPTY_PROVISIONING_CERTIFICATE_2,
+  OFFLINE_LICENSE_PROHIBITED,
+  STORAGE_PROHIBITED,
 };
 
 enum CdmKeyStatus {
@@ -229,6 +231,9 @@ enum CdmLicenseType {
   // If the original request was saved to make a service certificate request,
   // use Deferred for the license type in the subsequent request.
   kLicenseTypeDeferred,
+  // Like Streaming, but stricter.  Does not permit storage of any kind.
+  // Named after the 'temporary' session type in EME, which has this behavior.
+  kLicenseTypeTemporary,
 };
 
 enum SecurityLevel {