Source release 15.3.0

core/include/cdm_engine.h

@@ -137,6 +137,10 @@ class CdmEngine {
   virtual CdmResponseType RenewKey(const CdmSessionId& session_id,
                                    const CdmKeyResponse& key_data);
 
+  // Change the service certificate installed in a given session.
+  virtual CdmResponseType SetSessionServiceCertificate(
+      const CdmSessionId& session_id, const std::string& service_certificate);
+
   // Query system information
   virtual CdmResponseType QueryStatus(SecurityLevel security_level,
                                       const std::string& query_token,

core/include/cdm_session.h

@@ -43,19 +43,23 @@ class CdmSession {
   bool IsClosed() { return closed_; }
 
   // Initializes this instance of CdmSession with the given property set.
-  // |cdm_client_property_set| MAY be null, is owned by the caller,
-  // and must remain in scope throughout the scope of this session.
+  //
+  // |cdm_client_property_set| is caller owned, may be null, but must be in
+  // scope as long as the session is in scope.  The service certificate field is
+  // cached at the time Init() is called.
   virtual CdmResponseType Init(CdmClientPropertySet* cdm_client_property_set);
 
   // Initializes this instance of CdmSession with the given parmeters.
   // All parameters are owned by the caller.
-  // |service_certificate| is caller owned, cannot be null, and must be in
-  //     scope as long as the session is in scope.
-  // |cdm_client_property_set| is caller owned, may be null, but must be
-  //     in scope as long as the session is in scope.
+  //
+  // |cdm_client_property_set| is caller owned, may be null, but must be in
+  // scope as long as the session is in scope.  The service certificate field is
+  // cached at the time Init() is called.
+  //
   // |forced_session_id| is caller owned and may be null.
-  // |event_listener| is caller owned, may be null, but must be in scope
-  //     as long as the session is in scope.
+  //
+  // |event_listener| is caller owned, may be null, but must be in scope as long
+  // as the session is in scope.
   virtual CdmResponseType Init(CdmClientPropertySet* cdm_client_property_set,
                                const CdmSessionId* forced_session_id,
                                WvCdmEventListener* event_listener);
@@ -84,6 +88,11 @@ class CdmSession {
   // AddKey() - Accept license response and extract key info.
   virtual CdmResponseType AddKey(const CdmKeyResponse& key_response);
 
+  // Override the currently-installed service certificate with a new service
+  // certificate.
+  virtual CdmResponseType SetServiceCertificate(
+      const std::string& service_certificate);
+
   // Query session status
   virtual CdmResponseType QueryStatus(CdmQueryMap* query_response);
 

core/include/license.h

@@ -44,6 +44,11 @@ class CdmLicense {
                     const std::string& signed_service_certificate,
                     CryptoSession* session, PolicyEngine* policy_engine);
 
+  // Override the currently-installed service certificate with a new service
+  // certificate.
+  virtual CdmResponseType SetServiceCertificate(
+      const std::string& signed_service_certificate);
+
   virtual CdmResponseType PrepareKeyRequest(
       const InitializationData& init_data, CdmLicenseType license_type,
       const CdmAppParameterMap& app_parameters, CdmKeyMessage* signed_request,

core/include/wv_cdm_types.h

@@ -399,7 +399,11 @@ enum CdmResponseType {
   REWRAP_DEVICE_RSA_KEY_30_ERROR = 345,
   INVALID_SRM_LIST = 346,
   KEYSET_ID_NOT_FOUND_4 = 347,
-  // Don't forget to add new values to ../test/test_printers.cpp.
+  SESSION_NOT_FOUND_22 = 348,
+  // Don't forget to add new values to
+  //  * core/test/test_printers.cpp.
+  //  * android/include/mapErrors-inl.h
+  //  * android/include_hidl/mapErrors-inl.h
 };
 
 enum CdmKeyStatus {