commit cedd5b5cdf1800ee4df1031bb30400cb240f9401
author Eric Laurent <elaurent@google.com> Wed Mar 22 00:03:31 2023 +0000
committer Eric Laurent <elaurent@google.com> Wed Mar 22 00:03:31 2023 +0000
tree 31dfa31ed9fed1fd0c0d48f52e0c6ce5c378f8d8
parent 0a43cf2ab465ddabb3fff18b4bc4b112c33f49ce

audio policy: protect against null input device selection

Made two improvements in audio policy engine to avoid problems when
no suitable input device can be found for a given use case:
1) make sure getDeviceForInputSource() returns a valid device for
VOICE_COMMUNICATION use case.
2) in the general case, do not crash if getDeviceForInputSource()
returns a null device.

Bug: 274001478
Test: make
Change-Id: Ib7ad122b32f54cc429f0b4ab3ff58d4ff04ea09b

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 22e4686..f5c7a71 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -671,7 +671,10 @@
 
     audio_attributes_t attr = { .source = AUDIO_SOURCE_VOICE_COMMUNICATION };
     auto txSourceDevice = mEngine->getInputDeviceForAttributes(attr);
-    ALOG_ASSERT(txSourceDevice != 0, "%s() input selected device not available", __func__);
+    if (txSourceDevice == nullptr) {
+        ALOGE("%s() selected input device not available", __func__);
+        return INVALID_OPERATION;
+    }
 
     ALOGV("%s device rxDevice %s txDevice %s", __func__,
           rxDevices.itemAt(0)->toString().c_str(), txSourceDevice->toString().c_str());
@@ -5327,7 +5330,11 @@
     *session = (audio_session_t)mpClientInterface->newAudioUniqueId(AUDIO_UNIQUE_ID_USE_SESSION);
     *ioHandle = (audio_io_handle_t)mpClientInterface->newAudioUniqueId(AUDIO_UNIQUE_ID_USE_INPUT);
     audio_attributes_t attr = { .source = AUDIO_SOURCE_HOTWORD };
-    *device = mEngine->getInputDeviceForAttributes(attr)->type();
+    sp<DeviceDescriptor> deviceDesc = mEngine->getInputDeviceForAttributes(attr);
+    if (deviceDesc == nullptr) {
+        return INVALID_OPERATION;
+    }
+    *device = deviceDesc->type();
 
     return mSoundTriggerSessions.acquireSession(*session, *ioHandle);
 }