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

Commit cdd83cfb authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4473011 from e8ec9b2a to pi-release 

Change-Id: I25733a58a8a012fa79c77a4b77f7bc912b0057b9
parents cdc24762 e8ec9b2a

Android.bp

+0 −4
Original line number Diff line number Diff line 
subdirs = [

    "*"

]



hidl_package_root {

    name: "android.hardware",

    path: "hardware/interfaces",

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/Android.bp

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
// This is an autogenerated file, do not edit.

subdirs = [

    "2.0",

    "2.0/vts/functional",

    "common/2.0",

    "common/2.0/default",

    "common/test/utility",

    "effect/2.0",

    "effect/2.0/default",

    "effect/2.0/vts/functional",

]