update_engine: change notication order am: 57497984e2 am: 79fcc04fe4
Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/3201753
Change-Id: Ia8a7978ca65df7a7524ac812421ec0498bb9dc99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/aosp/update_attempter_android.cc b/aosp/update_attempter_android.cc
index b19d424..b5ec1e0 100644
--- a/aosp/update_attempter_android.cc
+++ b/aosp/update_attempter_android.cc
@@ -850,6 +850,9 @@
boot_control_->GetDynamicPartitionControl()->Cleanup();
+ for (auto observer : daemon_state_->service_observers())
+ observer->SendPayloadApplicationComplete(error_code);
+
download_progress_ = 0;
UpdateStatus new_status =
(error_code == ErrorCode::kSuccess ? UpdateStatus::UPDATED_NEED_REBOOT
@@ -863,9 +866,6 @@
LOG(WARNING) << "Unable to unbind network.";
}
- for (auto observer : daemon_state_->service_observers())
- observer->SendPayloadApplicationComplete(error_code);
-
CollectAndReportUpdateMetricsOnUpdateFinished(error_code);
ClearMetricsPrefs();
if (error_code == ErrorCode::kSuccess) {