diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-01-23 15:56:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-01-23 15:56:44 +0000 |
| commit | 6b058752c53d61596f8cda16dfa8f8842bca8a2e (patch) | |
| tree | 2440b48524cb120dff6b45276d00d8b057172b32 /audio/2.0/default/StreamIn.cpp | |
| parent | c2566d26212d7c1343612eb8d651b22e1ba0ea0a (diff) | |
| parent | 790db1074c92cc682c0da7fcdf454bd5e36f93fb (diff) | |
Merge "Use MQDescriptor typedefs for cleanup"
Diffstat (limited to 'audio/2.0/default/StreamIn.cpp')
| -rw-r--r-- | audio/2.0/default/StreamIn.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/audio/2.0/default/StreamIn.cpp b/audio/2.0/default/StreamIn.cpp index de7bf131ad..ad18986401 100644 --- a/audio/2.0/default/StreamIn.cpp +++ b/audio/2.0/default/StreamIn.cpp @@ -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(); } |