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

Commit 5d8244ee authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Use -Werror in hardware/interfaces/audio" am: 7a4422d2 

am: ae9fb022

Change-Id: Id07c0fd2c0735961a79c6559ac014a7321b95c1d
parents 099507a4 ae9fb022

audio/2.0/default/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ LOCAL_SRC_FILES := \ 
    StreamIn.cpp \

    StreamOut.cpp \



LOCAL_CFLAGS := -Wall -Werror



LOCAL_SHARED_LIBRARIES := \

    libbase \

    libcutils \
@@ -65,6 +67,8 @@ LOCAL_PROPRIETARY_MODULE := true 
LOCAL_SRC_FILES := \

    service.cpp



LOCAL_CFLAGS := -Wall -Werror



LOCAL_SHARED_LIBRARIES := \

    libhidlbase \

    libhidltransport \

audio/2.0/default/StreamIn.cpp

+1 −2
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ void ReadThread::doRead() { 
    }

    ssize_t readResult = mStream->read(mStream, &mBuffer[0], requestedToRead);

    mStatus.retval = Result::OK;

    uint64_t read = 0;

    if (readResult >= 0) {

        mStatus.reply.read = readResult;

        if (!mDataMQ->write(&mBuffer[0], readResult)) {
@@ -326,7 +325,7 @@ Return<void> StreamIn::prepareForReading(uint32_t frameSize, 
    ThreadInfo threadInfo = {0, 0};



    // Wrap the _hidl_cb to return an error

    auto sendError = [this, &threadInfo, &_hidl_cb](Result result) {

    auto sendError = [&threadInfo, &_hidl_cb](Result result) {

        _hidl_cb(result, CommandMQ::Descriptor(), DataMQ::Descriptor(),

                 StatusMQ::Descriptor(), threadInfo);

audio/2.0/default/StreamOut.cpp

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ Return<void> StreamOut::prepareForWriting(uint32_t frameSize, 
    ThreadInfo threadInfo = {0, 0};



    // Wrap the _hidl_cb to return an error

    auto sendError = [this, &threadInfo, &_hidl_cb](Result result) {

    auto sendError = [&threadInfo, &_hidl_cb](Result result) {

        _hidl_cb(result, CommandMQ::Descriptor(), DataMQ::Descriptor(),

                 StatusMQ::Descriptor(), threadInfo);

audio/effect/2.0/default/Android.bp

+1 −0
Original line number Diff line number Diff line 
cc_library_shared {

    name: "android.hardware.audio.effect@2.0-impl",

    defaults: ["hidl_defaults"],

    vendor: true,

    relative_install_path: "hw",

    srcs: [

audio/effect/2.0/default/Effect.cpp

+0 −2
Original line number Diff line number Diff line
@@ -610,10 +610,8 @@ Return<void> Effect::getSupportedAuxChannelsConfigs( 
}



Return<void> Effect::getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb)  {

    uint32_t halCmd = EFFECT_FEATURE_AUX_CHANNELS;

    uint32_t halResult[alignedSizeIn<uint32_t>(sizeof(uint32_t) + sizeof(channel_config_t))];

    memset(halResult, 0, sizeof(halResult));

    uint32_t halResultSize = 0;

    EffectAuxChannelsConfig result;

    Result retval = getCurrentConfigImpl(

            EFFECT_FEATURE_AUX_CHANNELS,