Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Use MQDescriptor typedefs for cleanup"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-01-23 15:56:43 +00:00
committed by Android (Google) Code Review
parent c2566d2621 790db1074c
commit 6b058752c5
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
audio/2.0/default/StreamIn.cpp
View File

@@ -275,7 +275,7 @@ Return<void> StreamIn::prepareForReading(
if (mDataMQ) {
ALOGE("the client attempts to call prepareForReading twice");
_hidl_cb(Result::INVALID_STATE,
MQDescriptorSync<uint8_t>(), MQDescriptorSync<ReadStatus>());
DataMQ::Descriptor(), StatusMQ::Descriptor());
return Void();
}
std::unique_ptr<DataMQ> tempDataMQ(
@@ -285,7 +285,7 @@ Return<void> StreamIn::prepareForReading(
ALOGE_IF(!tempDataMQ->isValid(), "data MQ is invalid");
ALOGE_IF(!tempStatusMQ->isValid(), "status MQ is invalid");
_hidl_cb(Result::INVALID_ARGUMENTS,
MQDescriptorSync<uint8_t>(), MQDescriptorSync<ReadStatus>());
DataMQ::Descriptor(), StatusMQ::Descriptor());
return Void();
}
// TODO: Remove event flag management once blocking MQ is implemented. b/33815422
@@ -293,7 +293,7 @@ Return<void> StreamIn::prepareForReading(
if (status != OK || !mEfGroup) {
ALOGE("failed creating event flag for data MQ: %s", strerror(-status));
_hidl_cb(Result::INVALID_ARGUMENTS,
MQDescriptorSync<uint8_t>(), MQDescriptorSync<ReadStatus>());
DataMQ::Descriptor(), StatusMQ::Descriptor());
return Void();
}
@@ -309,7 +309,7 @@ Return<void> StreamIn::prepareForReading(
if (status != OK) {
ALOGW("failed to start reader thread: %s", strerror(-status));
_hidl_cb(Result::INVALID_ARGUMENTS,
MQDescriptorSync<uint8_t>(), MQDescriptorSync<ReadStatus>());
DataMQ::Descriptor(), StatusMQ::Descriptor());
return Void();
}

8
audio/2.0/default/StreamOut.cpp
View File

@@ -259,7 +259,7 @@ Return<void> StreamOut::prepareForWriting(
if (mDataMQ) {
ALOGE("the client attempts to call prepareForWriting twice");
_hidl_cb(Result::INVALID_STATE,
MQDescriptorSync<uint8_t>(), MQDescriptorSync<WriteStatus>());
DataMQ::Descriptor(), StatusMQ::Descriptor());
return Void();
}
std::unique_ptr<DataMQ> tempDataMQ(
@@ -269,7 +269,7 @@ Return<void> StreamOut::prepareForWriting(
ALOGE_IF(!tempDataMQ->isValid(), "data MQ is invalid");
ALOGE_IF(!tempStatusMQ->isValid(), "status MQ is invalid");
_hidl_cb(Result::INVALID_ARGUMENTS,
MQDescriptorSync<uint8_t>(), MQDescriptorSync<WriteStatus>());
DataMQ::Descriptor(), StatusMQ::Descriptor());
return Void();
}
// TODO: Remove event flag management once blocking MQ is implemented. b/33815422
@@ -277,7 +277,7 @@ Return<void> StreamOut::prepareForWriting(
if (status != OK || !mEfGroup) {
ALOGE("failed creating event flag for data MQ: %s", strerror(-status));
_hidl_cb(Result::INVALID_ARGUMENTS,
MQDescriptorSync<uint8_t>(), MQDescriptorSync<WriteStatus>());
DataMQ::Descriptor(), StatusMQ::Descriptor());
return Void();
}
@@ -293,7 +293,7 @@ Return<void> StreamOut::prepareForWriting(
if (status != OK) {
ALOGW("failed to start writer thread: %s", strerror(-status));
_hidl_cb(Result::INVALID_ARGUMENTS,
MQDescriptorSync<uint8_t>(), MQDescriptorSync<WriteStatus>());
DataMQ::Descriptor(), StatusMQ::Descriptor());
return Void();
}

2
graphics/composer/2.1/default/HwcClient.cpp
View File

@@ -514,7 +514,7 @@ Return<void> HwcClient::getOutputCommandQueue(
if (outDescriptor) {
hidl_cb(Error::NONE, *outDescriptor);
} else {
hidl_cb(Error::NO_RESOURCES, MQDescriptorSync<uint32_t>());
hidl_cb(Error::NO_RESOURCES, CommandQueueType::Descriptor());
}
return Void();