Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 790db107 authored by Hridya Valsaraju's avatar Hridya Valsaraju
Browse files

Use MQDescriptor typedefs for cleanup 

Test: mm
Bug: 33815422

Change-Id: I41ca833231622a5a72970014cfcac400b512e44a
parent 1bf9910b

audio/2.0/default/StreamIn.cpp

+4 −4
Original line number Diff line number Diff line
@@ -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();

    }

audio/2.0/default/StreamOut.cpp

+4 −4
Original line number Diff line number Diff line
@@ -263,7 +263,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(
@@ -273,7 +273,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
@@ -281,7 +281,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();

    }
@@ -297,7 +297,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();

    }

graphics/composer/2.1/default/HwcClient.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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();