Merge "Corrections for limited duration licenses"

libwvdrmengine/cdm/core/src/cdm_session.cpp

@@ -640,8 +640,7 @@ CdmResponseType CdmSession::Decrypt(const CdmDecryptionParameters& params) {
 
   if (status == NO_ERROR) {
     if (is_initial_decryption_) {
-      policy_engine_->BeginDecryption();
-      is_initial_decryption_ = false;
+      is_initial_decryption_ = !policy_engine_->BeginDecryption();
     }
     has_decrypted_since_last_report_ = true;
     if (!is_usage_update_needed_) {

libwvdrmengine/cdm/core/src/policy_engine.cpp

@@ -231,7 +231,7 @@ void PolicyEngine::UpdateLicense(const License& license) {
   NotifyExpirationUpdate(current_time);
 }
 
-void PolicyEngine::BeginDecryption() {
+bool PolicyEngine::BeginDecryption() {
   if (playback_start_time_ == 0) {
     switch (license_state_) {
       case kLicenseStateCanPlay:
@@ -246,14 +246,17 @@ void PolicyEngine::BeginDecryption() {
           license_state_ = kLicenseStateNeedRenewal;
         }
         NotifyExpirationUpdate(playback_start_time_);
-        break;
+        return true;
       case kLicenseStateInitial:
       case kLicenseStatePending:
       case kLicenseStateExpired:
       default:
-        break;
+        return false;
     }
   }
+  else {
+    return true;
+  }
 }
 
 void PolicyEngine::DecryptionEvent() { last_playback_time_ = GetCurrentTime(); }