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

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

Merge "CCodec: ignore prepareInitialInputBuffers returning NO_MEMORY error" into tm-qpr-dev

parents eb700117 944b0a52
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -2141,7 +2141,8 @@ void CCodec::signalResume() {

    std::map<size_t, sp<MediaCodecBuffer>> clientInputBuffers;
    status_t err = mChannel->prepareInitialInputBuffers(&clientInputBuffers);
    if (err != OK) {
    // FIXME(b/237656746)
    if (err != OK && err != NO_MEMORY) {
        ALOGE("Resume request for Input Buffers failed");
        mCallback->onError(err, ACTION_CODE_FATAL);
        return;