Merge "Corrections for big usage table support in L3" into oc-dev am: 9edaf2ab39

am: 97a77d4c2c

Change-Id: Ie8949a574ae8ea3c9219fe483eeae985a54b05cd

libwvdrmengine/cdm/core/src/cdm_session.cpp

@@ -44,15 +44,6 @@ CdmSession::CdmSession(FileSystem* file_system) :
     usage_entry_number_(0),
     mock_license_parser_in_use_(false),
     mock_policy_engine_in_use_(false) {
-  CdmResponseType sts =
-      crypto_session_->GetUsageSupportType(&usage_support_type_);
-
-  if (sts != NO_ERROR) {
-    LOGW("CdmSession::CdmSession: Failed to get usage support type");
-  }
-  if (usage_support_type_ == kUsageEntrySupport)
-    usage_table_header_ = UsageTableHeader::GetInstance(file_system,
-                                                        crypto_session_.get());
   life_span_.Start();
 }
 
@@ -104,6 +95,13 @@ CdmResponseType CdmSession::Init(CdmClientPropertySet* cdm_client_property_set,
     return SESSION_FILE_HANDLE_INIT_ERROR;
   }
 
+  if (crypto_session_->GetUsageSupportType(&usage_support_type_) == NO_ERROR) {
+    if (usage_support_type_ == kUsageEntrySupport)
+      usage_table_header_ = crypto_session_->GetUsageTableHeader();
+  } else {
+    usage_support_type_ = kNonSecureUsageSupport;
+  }
+
   // Device Provisioning state is not yet known.
   // If not using certificates, then Keybox is client token for license
   // requests.
@@ -447,7 +445,8 @@ CdmResponseType CdmSession::AddKey(const CdmKeyResponse& key_response) {
         !provider_session_token.empty()) {
       if (sts != KEY_ADDED) {
         CdmResponseType sts =
-            usage_table_header_->DeleteEntry(usage_entry_number_);
+            usage_table_header_->DeleteEntry(usage_entry_number_,
+                                             file_handle_.get(), &metrics_);
         if (sts != NO_ERROR) {
           LOGW("CdmSession::AddKey: Delete usage entry failed = %d", sts);
         }
@@ -588,7 +587,7 @@ CdmResponseType CdmSession::Decrypt(const CdmDecryptionParameters& params) {
 CdmResponseType CdmSession::GenerateRenewalRequest(
     CdmKeyRequest* key_request) {
   CdmResponseType status = license_parser_->PrepareKeyUpdateRequest(
-      true, app_parameters_, &key_request->message, &key_request->url);
+      true, app_parameters_, NULL, &key_request->message, &key_request->url);
 
   key_request->type = kKeyRequestTypeRenewal;
 
@@ -618,8 +617,8 @@ CdmResponseType CdmSession::GenerateReleaseRequest(
     CdmKeyRequest* key_request) {
   is_release_ = true;
   CdmResponseType status = license_parser_->PrepareKeyUpdateRequest(
-      false, app_parameters_, &key_request->message,
-      &key_request->url);
+      false, app_parameters_, usage_table_header_ == NULL ? NULL : this,
+      &key_request->message, &key_request->url);
 
   key_request->type = kKeyRequestTypeRelease;
 
@@ -656,34 +655,50 @@ CdmResponseType CdmSession::ReleaseKey(const CdmKeyResponse& key_response) {
   if (is_offline_ || has_provider_session_token()) {
     DeleteLicense();
 
-    // Deletion of usage entry cannot occur while in use by a crypto session.
-    // So close and reopen after deletion.
     if (usage_support_type_ == kUsageEntrySupport) {
-      crypto_session_->Close();
-      CdmResponseType sts = usage_table_header_->DeleteEntry(usage_entry_number_);
-      if (sts != NO_ERROR) return sts;
-
-      M_TIME(
-          sts = crypto_session_->Open(requested_security_level_),
-          &metrics_,
-          crypto_session_open_,
-          sts,
-          requested_security_level_);
+      sts = DeleteUsageEntry(usage_entry_number_);
       if (NO_ERROR != sts) return sts;
     }
   }
   return NO_ERROR;
 }
 
-CdmResponseType CdmSession::DeleteUsageEntry(
-    const DeviceFiles::CdmUsageData& usage_data) {
+CdmResponseType CdmSession::DeleteUsageEntry(uint32_t usage_entry_number) {
   if (usage_support_type_ != kUsageEntrySupport) {
     LOGE("CdmSession::DeleteUsageEntry: Unexpected usage type supported: %d",
         usage_support_type_);
     return INCORRECT_USAGE_SUPPORT_TYPE_1;
   }
 
-  return usage_table_header_->DeleteEntry(usage_data.usage_entry_number);
+  // The usage entry cannot be deleted if it has a crypto session handling
+  // it, so close and reopen session.
+  CdmResponseType sts;
+  crypto_session_->Close();
+  crypto_session_.reset(new CryptoSession(&metrics_));
+  M_TIME(
+      sts = crypto_session_->Open(requested_security_level_),
+      &metrics_,
+      crypto_session_open_,
+      sts,
+      requested_security_level_);
+  if (sts != NO_ERROR) return sts;
+
+  usage_table_header_ = NULL;
+  if (crypto_session_->GetUsageSupportType(&usage_support_type_) == NO_ERROR) {
+    if (usage_support_type_ == kUsageEntrySupport)
+      usage_table_header_ = crypto_session_->GetUsageTableHeader();
+  } else {
+    usage_support_type_ = kNonSecureUsageSupport;
+  }
+
+  if (usage_table_header_ == NULL) {
+    LOGE("CdmSession::DeleteUsageEntry: Usage table header unavailable");
+    return INCORRECT_USAGE_SUPPORT_TYPE_1;
+  }
+
+  return usage_table_header_->DeleteEntry(usage_entry_number,
+                                          file_handle_.get(),
+                                          &metrics_);
 }
 
 bool CdmSession::IsKeyLoaded(const KeyId& key_id) {