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

Commit 690c0824 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "codec2: BufferPoolClient: fix NPE in fetchBufferHandle if connection is... 

Merge "codec2: BufferPoolClient: fix NPE in fetchBufferHandle if connection is null" into main am: c818adc8 am: 8b0e74ab

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3222209



Change-Id: I36d05354dd800496431a8a4de220f377760ad148
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9fe75fa4 8b0e74ab

media/bufferpool/aidl/default/BufferPoolClient.cpp

+4 −0
Original line number Diff line number Diff line
@@ -748,6 +748,10 @@ BufferPoolStatus BufferPoolClient::Impl::fetchBufferHandle( 
    } else {

        connection = mRemoteConnection;

    }

    if (!connection) {

        ALOGE("connection null: fetchBufferHandle()");

        return ResultStatus::CRITICAL_ERROR;

    }

    std::vector<FetchInfo> infos;

    std::vector<FetchResult> results;

    infos.emplace_back(FetchInfo{ToAidl(transactionId), ToAidl(bufferId)});