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

Commit 698109c7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Do not log error on open output/input stream negotiation"

parents b64230e3 0f8133fe

audio/core/all-versions/default/include/core/all-versions/default/Device.h

+2 −1
Original line number Diff line number Diff line
@@ -124,7 +124,8 @@ struct Device : public IDevice, public ParametersUtil { 
    Return<void> debug(const hidl_handle& fd, const hidl_vec<hidl_string>& options) override;



    // Utility methods for extending interfaces.

    Result analyzeStatus(const char* funcName, int status);

    Result analyzeStatus(const char* funcName, int status,

                         const std::vector<int>& ignoreErrors = {});

    void closeInputStream(audio_stream_in_t* stream);

    void closeOutputStream(audio_stream_out_t* stream);

    audio_hw_device_t* device() const { return mDevice; }

audio/core/all-versions/default/include/core/all-versions/default/Device.impl.h

+7 −4
Original line number Diff line number Diff line
@@ -40,8 +40,9 @@ Device::~Device() { 
    mDevice = nullptr;

}



Result Device::analyzeStatus(const char* funcName, int status) {

    return util::analyzeStatus("Device", funcName, status);

Result Device::analyzeStatus(const char* funcName, int status,

                             const std::vector<int>& ignoreErrors) {

    return util::analyzeStatus("Device", funcName, status, ignoreErrors);

}



void Device::closeInputStream(audio_stream_in_t* stream) {
@@ -155,7 +156,8 @@ Return<void> Device::openOutputStream(int32_t ioHandle, const DeviceAddress& dev 
    }

    AudioConfig suggestedConfig;

    HidlUtils::audioConfigFromHal(halConfig, &suggestedConfig);

    _hidl_cb(analyzeStatus("open_output_stream", status), streamOut, suggestedConfig);

    _hidl_cb(analyzeStatus("open_output_stream", status, {EINVAL} /* ignore */), streamOut,

             suggestedConfig);

    return Void();

}
@@ -183,7 +185,8 @@ Return<void> Device::openInputStream(int32_t ioHandle, const DeviceAddress& devi 
    }

    AudioConfig suggestedConfig;

    HidlUtils::audioConfigFromHal(halConfig, &suggestedConfig);

    _hidl_cb(analyzeStatus("open_input_stream", status), streamIn, suggestedConfig);

    _hidl_cb(analyzeStatus("open_input_stream", status, {EINVAL} /* ignore */), streamIn,

             suggestedConfig);

    return Void();

}