summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2021-05-19 01:09:40 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2021-05-19 01:09:40 +0000
commit13310a1969f61c07bf7523c9d42b4f59a11c9fc9 (patch)
tree168784584f7401cb3522307246fb7c5739a506e8
parent94788c993777380626d6f02f3ccaabb51f9d2ad4 (diff)
parent56ce23ae3ac59bc21ceaa747742c2a048b0762df (diff)
Snap for 7375516 from 56ce23ae3ac59bc21ceaa747742c2a048b0762df to sc-d1-release
Change-Id: I6baad3dc845cc7ae3d3542eea1c37ce811d95d5c
-rw-r--r--aosp/update_attempter_android.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/aosp/update_attempter_android.cc b/aosp/update_attempter_android.cc
index 2ffa0da3..4636c430 100644
--- a/aosp/update_attempter_android.cc
+++ b/aosp/update_attempter_android.cc
@@ -364,6 +364,12 @@ bool UpdateAttempterAndroid::ResetStatus(brillo::ErrorPtr* error) {
LOG(INFO) << "Attempting to reset state from "
<< UpdateStatusToString(status_) << " to UpdateStatus::IDLE";
+ if (apex_handler_android_ != nullptr) {
+ LOG(INFO) << "Cleaning up reserved space for compressed APEX (if any)";
+ std::vector<ApexInfo> apex_infos_blank;
+ apex_handler_android_->AllocateSpace(apex_infos_blank);
+ }
+
switch (status_) {
case UpdateStatus::IDLE: {
if (!boot_control_->GetDynamicPartitionControl()->ResetUpdate(prefs_)) {