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, 4 insertions, 3 deletions

diff --git a/bootctrl/BootControlShared.h b/bootctrl/BootControlShared.h
index ff49e3e..43aedba 100644
--- a/bootctrl/BootControlShared.h
+++ b/bootctrl/BootControlShared.h
@@ -16,17 +16,18 @@
 
 #pragma once
 
-#include <android/hardware/boot/1.1/IBootControl.h>
+#include <android/hardware/boot/1.2/IBootControl.h>
 #include <hidl/MQDescriptor.h>
 #include <hidl/Status.h>
 
 namespace android {
 namespace hardware {
 namespace boot {
-namespace V1_1 {
+namespace V1_2 {
 namespace implementation {
 
 using ::android::hardware::Return;
+using ::android::hardware::boot::V1_1::MergeStatus;
 
 struct BootControlShared : public IBootControl {
     BootControlShared();
@@ -40,7 +41,7 @@ struct BootControlShared : public IBootControl {
 extern "C" IBootControl *HIDL_FETCH_IBootControl(const char *name);
 
 }  // namespace implementation
-}  // namespace V1_1
+}  // namespace V1_2
 }  // namespace boot
 }  // namespace hardware
 }  // namespace android