diff options
| author | David Anderson <dvander@google.com> | 2019-10-30 13:07:33 -0700 |
|---|---|---|
| committer | David Anderson <dvander@google.com> | 2019-11-10 17:17:45 -0800 |
| commit | 953ea5dac0ca5aa3986bea47c157554cb2f96bd5 (patch) | |
| tree | 13c081aba88c64517dec7fc03f3d4922688a08ce /bootctrl/BootControlShared.h | |
| parent | 82f2f39a0d0b718c2975ef886f9a8d48470034e1 (diff) | |
bootctrl: Fix vendor space usage to not conflict with theme data.
Pixel writes theme data to the first bytes of vendor space, and reserves
the first 32x32 bytes for other such flags (such as the SOTA flag). To
avoid conflicts, instead use new AOSP-generic methods in
bootloader_message and libboot_control.
Bug: 139156011
Test: manual test
Change-Id: I7f31847acc21a0eeb46640cb9ed70be2a3f9531c
Diffstat (limited to 'bootctrl/BootControlShared.h')
| -rw-r--r-- | bootctrl/BootControlShared.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bootctrl/BootControlShared.h b/bootctrl/BootControlShared.h index 2f7a6a0..ff49e3e 100644 --- a/bootctrl/BootControlShared.h +++ b/bootctrl/BootControlShared.h @@ -31,11 +31,10 @@ using ::android::hardware::Return; struct BootControlShared : public IBootControl { BootControlShared(); + bool Init(); + Return<bool> setSnapshotMergeStatus(MergeStatus status) override; Return<MergeStatus> getSnapshotMergeStatus() override; - - protected: - std::string misc_device_; }; extern "C" IBootControl *HIDL_FETCH_IBootControl(const char *name); |