commit a56b0438aaad9e4160a57e14cd36981c26c1c388
author Devin Moore <devinmoore@google.com> Wed Jul 10 22:13:04 2024 +0000
committer Devin Moore <devinmoore@google.com> Tue Jul 16 22:55:25 2024 +0000
tree a36de51bb7585af0492a2ae1bd1c165b4bc20289
parent 50f740153143d39e78f5ecf827319f329b079b51

Update AIDL EventFlagBits to have the correct values

These values are swapped from the internal libfmq values.

Test: atest libfmq_test
Bug: 352396902
Change-Id: I8d9439282f8b502b9550ee7a9a7f317360853097

tests/aidl/android/fmq/test/EventFlagBits.aidl

diff --git a/tests/aidl/android/fmq/test/EventFlagBits.aidl b/tests/aidl/android/fmq/test/EventFlagBits.aidl
index 202a67c..1a9e44d 100644
--- a/tests/aidl/android/fmq/test/EventFlagBits.aidl
+++ b/tests/aidl/android/fmq/test/EventFlagBits.aidl
@@ -4,6 +4,6 @@
 
 @Backing(type="int")
 enum EventFlagBits {
-    FMQ_NOT_EMPTY = 1 << 0,
-    FMQ_NOT_FULL = 1 << 1,
+    FMQ_NOT_FULL = 1 << 0,
+    FMQ_NOT_EMPTY = 1 << 1,
 }

tests/fmq_unit_tests.cpp

diff --git a/tests/fmq_unit_tests.cpp b/tests/fmq_unit_tests.cpp
index 7abe74d..8ef1d27 100644
--- a/tests/fmq_unit_tests.cpp
+++ b/tests/fmq_unit_tests.cpp
@@ -35,8 +35,8 @@
 using android::hardware::kUnsynchronizedWrite;
 
 enum EventFlagBits : uint32_t {
-    kFmqNotEmpty = 1 << 0,
-    kFmqNotFull = 1 << 1,
+    kFmqNotFull = 1 << 0,
+    kFmqNotEmpty = 1 << 1,
 };
 
 typedef android::AidlMessageQueue<uint8_t, SynchronizedReadWrite> AidlMessageQueueSync;

tests/msgq_test_client.cpp

diff --git a/tests/msgq_test_client.cpp b/tests/msgq_test_client.cpp
index 53a971e..70de9dd 100644
--- a/tests/msgq_test_client.cpp
+++ b/tests/msgq_test_client.cpp
@@ -42,6 +42,12 @@
 using ::aidl::android::fmq::test::FixedUnion;
 using ::aidl::android::fmq::test::ITestAidlMsgQ;
 using android::hardware::tests::msgq::V1_0::ITestMsgQ;
+static_assert(static_cast<uint32_t>(ITestMsgQ::EventFlagBits::FMQ_NOT_FULL) ==
+                      static_cast<uint32_t>(EventFlagBits::FMQ_NOT_FULL),
+              "The AIDL and HIDL test interfaces must use the same values!");
+static_assert(static_cast<uint32_t>(ITestMsgQ::EventFlagBits::FMQ_NOT_EMPTY) ==
+                      static_cast<uint32_t>(EventFlagBits::FMQ_NOT_EMPTY),
+              "The AIDL and HIDL test interfaces must use the same values!");
 
 // libhidl
 using android::hardware::isHidlSupported;