summaryrefslogtreecommitdiff
path: root/audio/core/all-versions
diff options
context:
space:
mode:
authorAaron Kling <webgeek1234@gmail.com>2022-04-27 00:47:59 -0500
committerAaron Kling <webgeek1234@gmail.com>2022-04-27 00:48:37 -0500
commit3a3d512b860c561596906f2f849eab017d042c4a (patch)
tree19bdd9a917511966069f394cee8d1c268fdb9fce /audio/core/all-versions
parentcc17d0f741ebf7dcc54c3239bfb6b2a65edb3df6 (diff)
audio: Verify that hal implements get_audio_port before callingHEADs12.1
Change-Id: I3652382433d365407bf006d71f36743aa89a76ee
Diffstat (limited to 'audio/core/all-versions')
-rw-r--r--audio/core/all-versions/default/Device.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/audio/core/all-versions/default/Device.cpp b/audio/core/all-versions/default/Device.cpp
index c33e6f30f..440d0efde 100644
--- a/audio/core/all-versions/default/Device.cpp
+++ b/audio/core/all-versions/default/Device.cpp
@@ -366,6 +366,10 @@ template <typename HalPort>
Return<void> 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);