From c99d9755e171d906db327f565d0a2b81207d8766 Mon Sep 17 00:00:00 2001 From: Aaron Kling Date: Wed, 27 Apr 2022 00:47:59 -0500 Subject: [PATCH] sm8550-common: audio-impl: Verify that hal implements get_audio_port before calling Change-Id: I3652382433d365407bf006d71f36743aa89a76ee --- audio/impl/Device.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/audio/impl/Device.cpp b/audio/impl/Device.cpp index d03118a..ae015a3 100644 --- a/audio/impl/Device.cpp +++ b/audio/impl/Device.cpp @@ -404,6 +404,10 @@ template Return Device::getAudioPortImpl(const AudioPort& port, getAudioPort_cb _hidl_cb, int (*halGetter)(audio_hw_device_t*, HalPort*), const char* halGetterName) { + if (halGetter == nullptr) { + _hidl_cb(Result::NOT_SUPPORTED, port); + return Void(); + } HalPort halPort; if (status_t status = HidlUtils::audioPortToHal(port, &halPort); status != NO_ERROR) { _hidl_cb(analyzeStatus("audioPortToHal", status), port);