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

Commit 2ef68053 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11902131 from c986050f to 24Q3-release 

Change-Id: I6a94a5b666838b2cb8b1d305e479e6bd179c2769
parents 927c0b80 c986050f

media/audio/aconfig/aaudio.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -11,3 +11,10 @@ flag { 
    description: "Enable the AAudio sample rate converter."

    bug: "219533889"

}



flag {

    name: "start_stop_client_from_command_thread"

    namespace: "media_audio"

    description: "Start or stop client from command thread."

    bug: "341627085"

}

media/libaudiohal/impl/DeviceHalAidl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ class OutputStreamCallbackAidl : public StreamCallbackBase, 
        return runCb([](CbRef cb) { cb->onWriteReady(); });

    }

    ndk::ScopedAStatus onError() override {

        return runCb([](CbRef cb) { cb->onError(); });

        return runCb([](CbRef cb) { cb->onError(true /*isHardError*/); });

    }

    ndk::ScopedAStatus onDrainReady() override {

        return runCb([](CbRef cb) { cb->onDrainReady(); });

media/libaudiohal/impl/StreamHalAidl.cpp

+2 −2
Original line number Diff line number Diff line
@@ -905,10 +905,10 @@ void StreamOutHalAidl::onDrainReady() { 
    }

}



void StreamOutHalAidl::onError() {

void StreamOutHalAidl::onError(bool isHardError) {

    onAsyncError();

    if (auto clientCb = mClientCallback.load().promote(); clientCb != nullptr) {

        clientCb->onError();

        clientCb->onError(isHardError);

    }

}

media/libaudiohal/impl/StreamHalAidl.h

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ class StreamOutHalAidl : public virtual StreamOutHalInterface, 
    // StreamOutHalInterfaceCallback

    void onWriteReady() override;

    void onDrainReady() override;

    void onError() override;

    void onError(bool isHardError) override;



  private:

    friend class sp<StreamOutHalAidl>;

media/libaudiohal/impl/StreamHalHidl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -997,7 +997,7 @@ void StreamOutHalHidl::onError() { 
    sp<StreamOutHalInterfaceCallback> callback = mCallback.load().promote();

    if (callback == 0) return;

    ALOGV("asyncCallback onError");

    callback->onError();

    callback->onError(false /*isHardError*/);

}



void StreamOutHalHidl::onCodecFormatChanged(const std::vector<uint8_t>& metadataBs) {