Report actual payload type
Test: Run existing unit tests
Bug: 159849344
Change-Id: I870531d42d668072db4b56b86a9f3d40e46d0cfa
diff --git a/payload_consumer/download_action.h b/payload_consumer/download_action.h
index 1777e22..61c93d2 100644
--- a/payload_consumer/download_action.h
+++ b/payload_consumer/download_action.h
@@ -134,9 +134,6 @@
// Start downloading the current payload using delta_performer.
void StartDownloading();
- // The InstallPlan passed in
- InstallPlan install_plan_;
-
// Pointer to the current payload in install_plan_.payloads.
InstallPlan::Payload* payload_{nullptr};
diff --git a/payload_consumer/filesystem_verifier_action.h b/payload_consumer/filesystem_verifier_action.h
index 6ef3d16..7d179df 100644
--- a/payload_consumer/filesystem_verifier_action.h
+++ b/payload_consumer/filesystem_verifier_action.h
@@ -117,9 +117,6 @@
bool cancelled_{false}; // true if the action has been cancelled.
- // The install plan we're passed in via the input pipe.
- InstallPlan install_plan_;
-
// Calculates the hash of the data.
std::unique_ptr<HashCalculator> hasher_;
diff --git a/payload_consumer/install_plan.h b/payload_consumer/install_plan.h
index 7a95ab4..63178bd 100644
--- a/payload_consumer/install_plan.h
+++ b/payload_consumer/install_plan.h
@@ -195,9 +195,10 @@
typedef ActionTraits<InstallPlanAction>::InputObjectType InputObjectType;
typedef ActionTraits<InstallPlanAction>::OutputObjectType OutputObjectType;
- private:
+ protected:
InstallPlan install_plan_;
+ private:
DISALLOW_COPY_AND_ASSIGN(InstallPlanAction);
};
diff --git a/payload_consumer/postinstall_runner_action.h b/payload_consumer/postinstall_runner_action.h
index e5dfc40..bbc9e8c 100644
--- a/payload_consumer/postinstall_runner_action.h
+++ b/payload_consumer/postinstall_runner_action.h
@@ -97,8 +97,6 @@
// ready. Called when the post-install script was run for all the partitions.
void CompletePostinstall(ErrorCode error_code);
- InstallPlan install_plan_;
-
// The path where the filesystem will be mounted during post-install.
std::string fs_mount_dir_;
diff --git a/update_attempter_android.cc b/update_attempter_android.cc
index 4d74379..a554d38 100644
--- a/update_attempter_android.cc
+++ b/update_attempter_android.cc
@@ -592,6 +592,8 @@
SetStatusAndNotify(UpdateStatus::CLEANUP_PREVIOUS_UPDATE);
}
if (type == DownloadAction::StaticType()) {
+ auto download_action = static_cast<DownloadAction*>(action);
+ install_plan_ = *download_action->install_plan();
SetStatusAndNotify(UpdateStatus::VERIFYING);
} else if (type == FilesystemVerifierAction::StaticType()) {
SetStatusAndNotify(UpdateStatus::FINALIZING);