| commit | afd797f823009e39a16b2bf42b4d291d5df63836 | [log] [tgz] |
|---|---|---|
| author | Tianjie Xu <xunchang@google.com> | Fri Dec 11 23:02:11 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 11 23:02:11 2020 +0000 |
| tree | fd619468a8b1eab82f1c270151334986baff39ec | |
| parent | 2f7c222e5e31703ef48589faf5372204da9a000c [diff] | |
| parent | 8281ca965f0e99b5b90ffdbd508b255e6713e81c [diff] |
Merge "Add a function pointer to get active boot slot" am: c4b24df2ef am: 8281ca965f Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1514949 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6b99e5e590504bda7f681ae6cdd7557f74402378
diff --git a/include/hardware/boot_control.h b/include/hardware/boot_control.h index 36a867d..abbf3f1 100644 --- a/include/hardware/boot_control.h +++ b/include/hardware/boot_control.h
@@ -125,7 +125,14 @@ */ int (*isSlotMarkedSuccessful)(struct boot_control_module *module, unsigned slot); - void* reserved[31]; + /** + * Returns the active slot to boot into on the next boot. If + * setActiveBootSlot() has been called, the getter function should return + * the same slot as the one provided in the last setActiveBootSlot() call. + */ + unsigned (*getActiveBootSlot)(struct boot_control_module *module); + + void* reserved[30]; } boot_control_module_t;