From f7e5f24ff87ee96777442d39417c7c460083aebe Mon Sep 17 00:00:00 2001 From: Janis Danisevskis Date: Thu, 22 Mar 2018 10:08:07 -0700 Subject: [PATCH] Add Vendor comand to ConfirmationUI support msg_formatting This is not a HAL change. It just adds a command to msg_formatting.h as a service to vendors who have to augment the protocol between the HAL service and the TA or other implementation with janitorial commands that don't effect the HAL interface. Bug: 76152930 Test: No functional change Change-Id: I5d4e5dadea29d4c7d51753939eda6c3f3571fae1 --- .../android/hardware/confirmationui/support/msg_formatting.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/confirmationui/support/include/android/hardware/confirmationui/support/msg_formatting.h b/confirmationui/support/include/android/hardware/confirmationui/support/msg_formatting.h index 0d03591776..6558799bb7 100644 --- a/confirmationui/support/include/android/hardware/confirmationui/support/msg_formatting.h +++ b/confirmationui/support/include/android/hardware/confirmationui/support/msg_formatting.h @@ -105,6 +105,7 @@ enum class Command : uint32_t { PromptUserConfirmation, DeliverSecureInputEvent, Abort, + Vendor, }; template @@ -115,6 +116,7 @@ struct Cmd {}; DECLARE_COMMAND(PromptUserConfirmation); DECLARE_COMMAND(DeliverSecureInputEvent); DECLARE_COMMAND(Abort); +DECLARE_COMMAND(Vendor); using PromptUserConfirmationMsg = Message, hidl_string, hidl_vec>; @@ -166,7 +168,7 @@ inline void zero(volatile uint8_t* begin, const volatile uint8_t* end) { } inline void zero(const volatile uint8_t*, const volatile uint8_t*) {} // This odd alignment function aligns the stream position to a 4byte and never 8byte boundary -// It is to accommodate the 4 byte size field which is then followed by 8byte alligned data. +// It is to accommodate the 4 byte size field which is then followed by 8byte aligned data. template StreamState unalign(StreamState s) { uint8_t unalignment = uintptr_t(s.pos_) & 0x3;