Merge "Update VTS golden files for change in TestMsgq.aidl"
diff --git a/compilation_tools/vtsc/test/golden/DRIVER/TestMsgQ.driver.cpp b/compilation_tools/vtsc/test/golden/DRIVER/TestMsgQ.driver.cpp
index 53048c4..188aadb 100644
--- a/compilation_tools/vtsc/test/golden/DRIVER/TestMsgQ.driver.cpp
+++ b/compilation_tools/vtsc/test/golden/DRIVER/TestMsgQ.driver.cpp
@@ -51,7 +51,7 @@
::android::hardware::Return<bool> Vts_android_hardware_tests_msgq_V1_0_ITestMsgQ::configureFmqSyncReadWrite(
- const ::android::hardware::MQDescriptorSync<uint16_t>& arg0 __attribute__((__unused__))) {
+ const ::android::hardware::MQDescriptorSync<int32_t>& arg0 __attribute__((__unused__))) {
LOG(INFO) << "configureFmqSyncReadWrite called";
AndroidSystemCallbackRequestMessage callback_message;
callback_message.set_id(GetCallbackID("configureFmqSyncReadWrite"));
@@ -60,14 +60,14 @@
var_msg0->set_type(TYPE_FMQ_SYNC);
VariableSpecificationMessage* var_msg0_item = var_msg0->add_fmq_value();
var_msg0_item->set_type(TYPE_SCALAR);
- var_msg0_item->set_scalar_type("uint16_t");
- var_msg0_item->set_fmq_desc_address(reinterpret_cast<size_t>(new (std::nothrow) ::android::hardware::MQDescriptorSync<uint16_t>(arg0)));
+ var_msg0_item->set_scalar_type("int32_t");
+ var_msg0_item->set_fmq_desc_address(reinterpret_cast<size_t>(new (std::nothrow) ::android::hardware::MQDescriptorSync<int32_t>(arg0)));
RpcCallToAgent(callback_message, callback_socket_name_);
return static_cast<bool>(0);
}
::android::hardware::Return<void> Vts_android_hardware_tests_msgq_V1_0_ITestMsgQ::getFmqUnsyncWrite(
- bool arg0 __attribute__((__unused__)), std::function<void(bool arg0,const ::android::hardware::MQDescriptorUnsync<uint16_t>& arg1)> cb) {
+ bool arg0 __attribute__((__unused__)), std::function<void(bool arg0,const ::android::hardware::MQDescriptorUnsync<int32_t>& arg1)> cb) {
LOG(INFO) << "getFmqUnsyncWrite called";
AndroidSystemCallbackRequestMessage callback_message;
callback_message.set_id(GetCallbackID("getFmqUnsyncWrite"));
@@ -77,7 +77,7 @@
var_msg0->set_scalar_type("bool_t");
var_msg0->mutable_scalar_value()->set_bool_t(arg0);
RpcCallToAgent(callback_message, callback_socket_name_);
- cb(static_cast<bool>(0), ::android::hardware::MQDescriptorUnsync<uint16_t>());
+ cb(static_cast<bool>(0), ::android::hardware::MQDescriptorUnsync<int32_t>());
return ::android::hardware::Void();
}
@@ -211,14 +211,14 @@
return false;
}
if (!strcmp(func_name, "configureFmqSyncReadWrite")) {
- const ::android::hardware::MQDescriptorSync<uint16_t>* arg0;
+ const ::android::hardware::MQDescriptorSync<int32_t>* arg0;
if (func_msg.arg(0).fmq_value_size() > 0 && func_msg.arg(0).fmq_value(0).has_fmq_desc_address()) {
- arg0 = reinterpret_cast<::android::hardware::MQDescriptorSync<uint16_t>*>(func_msg.arg(0).fmq_value(0).fmq_desc_address());
+ arg0 = reinterpret_cast<::android::hardware::MQDescriptorSync<int32_t>*>(func_msg.arg(0).fmq_value(0).fmq_desc_address());
} else {
- ::android::hardware::MessageQueue<uint16_t, ::android::hardware::kSynchronizedReadWrite> arg0_sync_q(1024);
+ ::android::hardware::MessageQueue<int32_t, ::android::hardware::kSynchronizedReadWrite> arg0_sync_q(1024);
for (int i = 0; i < (int)func_msg.arg(0).fmq_value_size(); i++) {
- uint16_t arg0_sync_q_item;
- arg0_sync_q_item = func_msg.arg(0).fmq_value(i).scalar_value().uint16_t();
+ int32_t arg0_sync_q_item;
+ arg0_sync_q_item = func_msg.arg(0).fmq_value(i).scalar_value().int32_t();
arg0_sync_q.write(&arg0_sync_q_item);
}
arg0 = arg0_sync_q.getDesc();
@@ -236,7 +236,7 @@
bool arg0 = 0;
arg0 = func_msg.arg(0).scalar_value().bool_t();
LOG(DEBUG) << "local_device = " << hw_binder_proxy_.get();
- hw_binder_proxy_->getFmqUnsyncWrite(arg0, [&](bool arg0 __attribute__((__unused__)),const ::android::hardware::MQDescriptorUnsync<uint16_t>& arg1 __attribute__((__unused__))){
+ hw_binder_proxy_->getFmqUnsyncWrite(arg0, [&](bool arg0 __attribute__((__unused__)),const ::android::hardware::MQDescriptorUnsync<int32_t>& arg1 __attribute__((__unused__))){
LOG(INFO) << "callback getFmqUnsyncWrite called";
result_msg->set_name("getFmqUnsyncWrite");
VariableSpecificationMessage* result_val_0 = result_msg->add_return_type_hidl();
@@ -247,8 +247,8 @@
result_val_1->set_type(TYPE_FMQ_UNSYNC);
VariableSpecificationMessage* result_val_1_item = result_val_1->add_fmq_value();
result_val_1_item->set_type(TYPE_SCALAR);
- result_val_1_item->set_scalar_type("uint16_t");
- result_val_1_item->set_fmq_desc_address(reinterpret_cast<size_t>(new (std::nothrow) ::android::hardware::MQDescriptorUnsync<uint16_t>(arg1)));
+ result_val_1_item->set_scalar_type("int32_t");
+ result_val_1_item->set_fmq_desc_address(reinterpret_cast<size_t>(new (std::nothrow) ::android::hardware::MQDescriptorUnsync<int32_t>(arg1)));
});
return true;
}
diff --git a/compilation_tools/vtsc/test/golden/DRIVER/TestMsgQ.vts.h b/compilation_tools/vtsc/test/golden/DRIVER/TestMsgQ.vts.h
index 70e1b39..d1e1291 100644
--- a/compilation_tools/vtsc/test/golden/DRIVER/TestMsgQ.vts.h
+++ b/compilation_tools/vtsc/test/golden/DRIVER/TestMsgQ.vts.h
@@ -36,10 +36,10 @@
virtual ~Vts_android_hardware_tests_msgq_V1_0_ITestMsgQ() = default;
::android::hardware::Return<bool> configureFmqSyncReadWrite(
- const ::android::hardware::MQDescriptorSync<uint16_t>& arg0) override;
+ const ::android::hardware::MQDescriptorSync<int32_t>& arg0) override;
::android::hardware::Return<void> getFmqUnsyncWrite(
- bool arg0, std::function<void(bool arg0,const ::android::hardware::MQDescriptorUnsync<uint16_t>& arg1)> cb) override;
+ bool arg0, std::function<void(bool arg0,const ::android::hardware::MQDescriptorUnsync<int32_t>& arg1)> cb) override;
::android::hardware::Return<bool> requestWriteFmqSync(
int32_t arg0) override;
diff --git a/compilation_tools/vtsc/test/golden/PROFILER/TestMsgQ.profiler.cpp b/compilation_tools/vtsc/test/golden/PROFILER/TestMsgQ.profiler.cpp
index c03ceba..2c1783e 100644
--- a/compilation_tools/vtsc/test/golden/PROFILER/TestMsgQ.profiler.cpp
+++ b/compilation_tools/vtsc/test/golden/PROFILER/TestMsgQ.profiler.cpp
@@ -57,18 +57,18 @@
break;
}
auto *arg_0 __attribute__((__unused__)) = msg.add_arg();
- ::android::hardware::MQDescriptorSync<uint16_t> *arg_val_0 __attribute__((__unused__)) = reinterpret_cast<::android::hardware::MQDescriptorSync<uint16_t>*> ((*args)[0]);
+ ::android::hardware::MQDescriptorSync<int32_t> *arg_val_0 __attribute__((__unused__)) = reinterpret_cast<::android::hardware::MQDescriptorSync<int32_t>*> ((*args)[0]);
if (arg_val_0 != nullptr) {
arg_0->set_type(TYPE_FMQ_SYNC);
- MessageQueue<uint16_t, kSynchronizedReadWrite> arg_0_q((*arg_val_0), false);
+ MessageQueue<int32_t, kSynchronizedReadWrite> arg_0_q((*arg_val_0), false);
if (arg_0_q.isValid()) {
for (int i = 0; i < (int)arg_0_q.availableToRead(); i++) {
auto *arg_0_item_i = arg_0->add_fmq_value();
- uint16_t arg_0_result;
+ int32_t arg_0_result;
arg_0_q.read(&arg_0_result);
arg_0_q.write(&arg_0_result);
arg_0_item_i->set_type(TYPE_SCALAR);
- arg_0_item_i->mutable_scalar_value()->set_uint16_t(arg_0_result);
+ arg_0_item_i->mutable_scalar_value()->set_int32_t(arg_0_result);
}
}
} else {
@@ -147,17 +147,17 @@
LOG(WARNING) << "return value 0 is null.";
}
auto *result_1 __attribute__((__unused__)) = msg.add_return_type_hidl();
- ::android::hardware::MQDescriptorUnsync<uint16_t> *result_val_1 __attribute__((__unused__)) = reinterpret_cast<::android::hardware::MQDescriptorUnsync<uint16_t>*> ((*args)[1]);
+ ::android::hardware::MQDescriptorUnsync<int32_t> *result_val_1 __attribute__((__unused__)) = reinterpret_cast<::android::hardware::MQDescriptorUnsync<int32_t>*> ((*args)[1]);
if (result_val_1 != nullptr) {
result_1->set_type(TYPE_FMQ_UNSYNC);
- MessageQueue<uint16_t, kUnsynchronizedWrite> result_1_q((*result_val_1));
+ MessageQueue<int32_t, kUnsynchronizedWrite> result_1_q((*result_val_1));
if (result_1_q.isValid()) {
for (int i = 0; i < (int)result_1_q.availableToRead(); i++) {
auto *result_1_item_i = result_1->add_fmq_value();
- uint16_t result_1_result;
+ int32_t result_1_result;
result_1_q.read(&result_1_result);
result_1_item_i->set_type(TYPE_SCALAR);
- result_1_item_i->mutable_scalar_value()->set_uint16_t(result_1_result);
+ result_1_item_i->mutable_scalar_value()->set_int32_t(result_1_result);
}
}
} else {
