Update to bootcontrol 1.2 for Pixel

bootcontrol 1.2 adds a new function to get the active boot slot
on the next boot. This is useful for resume on reboot to verify
the device state to boot into; and set the corresponding vbmeta
digest accordingly.

Bug: 173808057
Test: Vts tests for bootcontrol
Change-Id: Ie2c933e4a80b9722b4c4865f33d3996c1601cdf6

1 files changed, 5 insertions, 2 deletions

diff --git a/bootctrl/LegacyBootControl.h b/bootctrl/LegacyBootControl.h
index 0653cbd..75548b0 100644
--- a/bootctrl/LegacyBootControl.h
+++ b/bootctrl/LegacyBootControl.h
@@ -24,7 +24,7 @@
 namespace android {
 namespace hardware {
 namespace boot {
-namespace V1_1 {
+namespace V1_2 {
 namespace implementation {
 
 using ::android::hardware::Return;
@@ -43,6 +43,9 @@ struct BootControl : public BootControlShared {
     Return<BoolResult> isSlotMarkedSuccessful(uint32_t slot) override;
     Return<void> getSuffix(uint32_t slot, getSuffix_cb _hidl_cb) override;
 
+    // Methods from ::android::hardware::boot::V1_2::IBootControl follow.
+    Return<uint32_t> getActiveBootSlot() override;
+
   private:
     boot_control_module_t *mModule;
 };
@@ -50,7 +53,7 @@ struct BootControl : public BootControlShared {
 extern "C" IBootControl *HIDL_FETCH_IBootControl(const char *name);
 
 }  // namespace implementation
-}  // namespace V1_1
+}  // namespace V1_2
 }  // namespace boot
 }  // namespace hardware
 }  // namespace android