Merge pull request #3351 from smartdevicelink/release/6.1.1

Hotfix Release 6.1.1
smartdevicelink · May 1, 2020 · 0ce7625 · 0ce7625
2 parents a3edf21 + 6255b4f
commit 0ce7625
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc
@@ -1656,6 +1656,10 @@ std::string PolicyHandler::GetNextUpdateUrl(
   POLICY_LIB_CHECK_OR_RETURN(std::string());
   app_id = ChoosePTUApplication(iteration_type);
 
+  if (0 == app_id) {
+    return std::string();
+  }
+
   // Use cached URL for retries if it was provided by the HMI
   if (PTUIterationType::RetryIteration == iteration_type &&
       !retry_update_url_.empty()) {

diff --git a/src/components/policy/policy_regular/src/cache_manager.cc b/src/components/policy/policy_regular/src/cache_manager.cc
@@ -1412,6 +1412,10 @@ std::shared_ptr<policy_table::Table> CacheManager::GenerateSnapshot() {
   snapshot_->policy_table.module_meta = pt_->policy_table.module_meta;
   snapshot_->policy_table.usage_and_error_counts =
       pt_->policy_table.usage_and_error_counts;
+  snapshot_->policy_table.usage_and_error_counts->app_level =
+      pt_->policy_table.usage_and_error_counts->app_level;
+  snapshot_->policy_table.usage_and_error_counts->mark_initialized();
+  snapshot_->policy_table.usage_and_error_counts->app_level->mark_initialized();
   snapshot_->policy_table.device_data = pt_->policy_table.device_data;
 
   if (pt_->policy_table.vehicle_data.is_initialized()) {