commit efbd36c8f57f41b0ef061cde5a88a3d384538fc9
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jan 23 15:56:43 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 23 15:56:44 2017 +0000
tree 268b180eb5dc1bb13d783fb3b91c0f577b26686d
parent 217fc01b390d88993c1c94669b251f952fe2c44e
parent 085ae9a0c72e1d1ed76533973b20ead13f5b3cac

Merge "Cleanup MQDescriptor usage with typedefs"

media/libaudiohal/StreamHalHidl.cpp

diff --git a/media/libaudiohal/StreamHalHidl.cpp b/media/libaudiohal/StreamHalHidl.cpp
index cbc8a08..9ee8fa8 100644
--- a/media/libaudiohal/StreamHalHidl.cpp
+++ b/media/libaudiohal/StreamHalHidl.cpp
@@ -340,8 +340,8 @@
     Return<void> ret = mStream->prepareForWriting(
             1, bufferSize, ThreadPriority(mHalThreadPriority),
             [&](Result r,
-                    const MQDescriptorSync<uint8_t>& dataMQ,
-                    const MQDescriptorSync<WriteStatus>& statusMQ) {
+                    const DataMQ::Descriptor& dataMQ,
+                    const StatusMQ::Descriptor& statusMQ) {
                 retval = r;
                 if (retval == Result::OK) {
                     tempDataMQ.reset(new DataMQ(dataMQ));
@@ -567,8 +567,8 @@
     Return<void> ret = mStream->prepareForReading(
             1, bufferSize, ThreadPriority(mHalThreadPriority),
             [&](Result r,
-                    const MQDescriptorSync<uint8_t>& dataMQ,
-                    const MQDescriptorSync<ReadStatus>& statusMQ) {
+                    const DataMQ::Descriptor& dataMQ,
+                    const StatusMQ::Descriptor& statusMQ) {
                 retval = r;
                 if (retval == Result::OK) {
                     tempDataMQ.reset(new DataMQ(dataMQ));