diff options
author | Tianjie <xunchang@google.com> | 2020-11-30 14:38:35 -0800 |
---|---|---|
committer | Tianjie <xunchang@google.com> | 2020-12-03 23:00:08 -0800 |
commit | 253b46db055de909aae18cbfc1dcf943b26c607e (patch) | |
tree | 4dd9feadfba8cce51e1da84a08ebb62aa167cef1 /bootctrl/BootControlShared.cpp | |
parent | af4135035abb5b2f1d16639bfb718dd75b1ca048 (diff) |
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
Diffstat (limited to 'bootctrl/BootControlShared.cpp')
-rw-r--r-- | bootctrl/BootControlShared.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bootctrl/BootControlShared.cpp b/bootctrl/BootControlShared.cpp index 125bec4..e5b9797 100644 --- a/bootctrl/BootControlShared.cpp +++ b/bootctrl/BootControlShared.cpp @@ -27,7 +27,7 @@ namespace android { namespace hardware { namespace boot { -namespace V1_1 { +namespace V1_2 { namespace implementation { using android::bootable::GetMiscVirtualAbMergeStatus; @@ -54,7 +54,7 @@ Return<MergeStatus> BootControlShared::getSnapshotMergeStatus() { } } // namespace implementation -} // namespace V1_1 +} // namespace V1_2 } // namespace boot } // namespace hardware } // namespace android |