commit 9ad15ff8c4e0ae23df61022e69ba38362c94c67b
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 07 23:32:28 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 07 23:32:28 2020 +0000
tree 8d365aaac7a9d972903a2b81f01068ca42b24dd2
parent 2464cd70f9bccb944d96aeda1b9c915508f947be
parent 3ee519e182dfc26a7d6179604c816892385f3b03

Merge "aaudio: align AAudioServiceMessage for 32/64 bits" into rvc-dev

media/libaaudio/src/binding/AAudioServiceMessage.h

diff --git a/media/libaaudio/src/binding/AAudioServiceMessage.h b/media/libaaudio/src/binding/AAudioServiceMessage.h
index 3981454..62927a0 100644
--- a/media/libaaudio/src/binding/AAudioServiceMessage.h
+++ b/media/libaaudio/src/binding/AAudioServiceMessage.h
@@ -44,6 +44,8 @@
 struct AAudioMessageEvent {
     aaudio_service_event_t event;
     union {
+        // Align so that 32 and 64-bit code can exchange messages through shared memory.
+        alignas(8)
         double  dataDouble;
         int64_t dataLong;
     };
@@ -57,8 +59,10 @@
         EVENT,
     };
 
-    code what;
+    code      what;
     union {
+        // Align so that 32 and 64-bit code can exchange messages through shared memory.
+        alignas(8)
         AAudioMessageTimestamp timestamp; // what == TIMESTAMP
         AAudioMessageEvent event;         // what == EVENT
     };