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

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

Change-Id: I9e01d6c66e2459ed9f58451a73e586145ea6cbe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Steven Moreland
2023-12-28 04:21:55 +00:00
committed by Automerger Merge Worker

View File

@@ -297,7 +297,7 @@ BufferPoolClient::Impl::Impl(const std::shared_ptr<IAccessor> &accessor,
mLastEvictCacheMs(::android::elapsedRealtime()) { mLastEvictCacheMs(::android::elapsedRealtime()) {
IAccessor::ConnectionInfo conInfo; IAccessor::ConnectionInfo conInfo;
bool valid = false; 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 channel = std::make_unique<BufferStatusChannel>(conInfo.toFmqDesc);
auto observer = std::make_unique<BufferInvalidationListener>(conInfo.fromFmqDesc); auto observer = std::make_unique<BufferInvalidationListener>(conInfo.fromFmqDesc);