summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2020-12-11 22:41:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-11 22:41:54 +0000
commit8281ca965f0e99b5b90ffdbd508b255e6713e81c (patch)
treefd619468a8b1eab82f1c270151334986baff39ec
parente8860846c60975257ac45b7f0eb16b8fa32842ef (diff)
parentc4b24df2efe84f942ebf9489f7abb0f459c5a91b (diff)
downloadlibhardware-8281ca965f0e99b5b90ffdbd508b255e6713e81c.tar.gz
Merge "Add a function pointer to get active boot slot" am: c4b24df2ef
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1514949 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie39cf55d1752b1c60746d986395db769eb8d9d06
-rw-r--r--include/hardware/boot_control.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/include/hardware/boot_control.h b/include/hardware/boot_control.h
index 36a867da..abbf3f19 100644
--- a/include/hardware/boot_control.h
+++ b/include/hardware/boot_control.h
@@ -125,7 +125,14 @@ typedef struct boot_control_module {
*/
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;