commit 4a2568d1d66f4fc3649ea7bc6581577851bed380
author Devin Moore <devinmoore@google.com> Tue Sep 22 17:20:54 2020 +0000
committer Devin Moore <devinmoore@google.com> Tue Sep 22 17:31:28 2020 +0000
tree 9a258cc37a83999b346bb92399ee29379fd9d1d5
parent 15def33d4b876575ea00cc1e335ae420d0b3454c

Reland "Change payload type to int32_t for fmq device tests"

15def33d4b876575ea00cc1e335ae420d0b3454c

Bug: 142326204

Change-Id: I5aab4701fa6c5003e705a8af25c28fd151841bce

tests/aidl/default/TestAidlMsgQ.cpp

diff --git a/tests/aidl/default/TestAidlMsgQ.cpp b/tests/aidl/default/TestAidlMsgQ.cpp
index 0d6153e..2c5bd69 100644
--- a/tests/aidl/default/TestAidlMsgQ.cpp
+++ b/tests/aidl/default/TestAidlMsgQ.cpp
@@ -59,7 +59,7 @@
 }
 
 ndk::ScopedAStatus TestAidlMsgQ::requestBlockingRead(int32_t count) {
-    std::vector<uint16_t> data(count);
+    std::vector<int32_t> data(count);
     bool result = mFmqSynchronized->readBlocking(
             &data[0], count, static_cast<uint32_t>(EventFlagBits::FMQ_NOT_FULL),
             static_cast<uint32_t>(EventFlagBits::FMQ_NOT_EMPTY), 5000000000 /* timeOutNanos */);
@@ -71,7 +71,7 @@
 }
 
 ndk::ScopedAStatus TestAidlMsgQ::requestBlockingReadDefaultEventFlagBits(int32_t count) {
-    std::vector<uint16_t> data(count);
+    std::vector<int32_t> data(count);
     bool result = mFmqSynchronized->readBlocking(&data[0], count);
 
     if (result == false) {
@@ -82,7 +82,7 @@
 }
 
 ndk::ScopedAStatus TestAidlMsgQ::requestBlockingReadRepeat(int32_t count, int32_t numIter) {
-    std::vector<uint16_t> data(count);
+    std::vector<int32_t> data(count);
     for (int i = 0; i < numIter; i++) {
         bool result = mFmqSynchronized->readBlocking(
                 &data[0], count, static_cast<uint32_t>(EventFlagBits::FMQ_NOT_FULL),
@@ -98,21 +98,21 @@
 }
 
 ndk::ScopedAStatus TestAidlMsgQ::requestReadFmqSync(int32_t count, bool* _aidl_return) {
-    std::vector<uint16_t> data(count);
+    std::vector<int32_t> data(count);
     bool result = mFmqSynchronized->read(&data[0], count) && verifyData(&data[0], count);
     *_aidl_return = result;
     return ndk::ScopedAStatus::ok();
 }
 
 ndk::ScopedAStatus TestAidlMsgQ::requestReadFmqUnsync(int32_t count, bool* _aidl_return) {
-    std::vector<uint16_t> data(count);
+    std::vector<int32_t> data(count);
     bool result = mFmqUnsynchronized->read(&data[0], count) && verifyData(&data[0], count);
     *_aidl_return = result;
     return ndk::ScopedAStatus::ok();
 }
 
 ndk::ScopedAStatus TestAidlMsgQ::requestWriteFmqSync(int32_t count, bool* _aidl_return) {
-    std::vector<uint16_t> data(count);
+    std::vector<int32_t> data(count);
     for (int i = 0; i < count; i++) {
         data[i] = i;
     }
@@ -122,7 +122,7 @@
 }
 
 ndk::ScopedAStatus TestAidlMsgQ::requestWriteFmqUnsync(int32_t count, bool* _aidl_return) {
-    std::vector<uint16_t> data(count);
+    std::vector<int32_t> data(count);
     for (int i = 0; i < count; i++) {
         data[i] = i;
     }