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

Commit 20c1948a authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "BufferPoolClient: avoid dereference null accessor" into main am: 85333361 am: 71d3a7cc 

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



Change-Id: I9e01d6c66e2459ed9f58451a73e586145ea6cbe0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 78d8c4dd 71d3a7cc

media/bufferpool/aidl/default/BufferPoolClient.cpp

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ BufferPoolClient::Impl::Impl(const std::shared_ptr<IAccessor> &accessor, 
      mLastEvictCacheMs(::android::elapsedRealtime()) {

    IAccessor::ConnectionInfo conInfo;

    bool valid = false;

    if(accessor->connect(observer, &conInfo).isOk()) {

    if (accessor && accessor->connect(observer, &conInfo).isOk()) {

        auto channel = std::make_unique<BufferStatusChannel>(conInfo.toFmqDesc);

        auto observer = std::make_unique<BufferInvalidationListener>(conInfo.fromFmqDesc);