summaryrefslogtreecommitdiffstats
path: root/services/audiopolicy/AudioPolicyManager.cpp
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2014-08-04 20:36:31 -0700
committerEric Laurent <elaurent@google.com>2014-08-05 17:16:32 -0700
commitcf817a2330936947df94c11859f48771f5596a59 (patch)
treec9c386dabb997f20b2f1046b6087b26e71b66ed9 /services/audiopolicy/AudioPolicyManager.cpp
parente46711343b43786c049a007369a72c1c78e6c5db (diff)
downloadframeworks_av-cf817a2330936947df94c11859f48771f5596a59.zip
frameworks_av-cf817a2330936947df94c11859f48771f5596a59.tar.gz
frameworks_av-cf817a2330936947df94c11859f48771f5596a59.tar.bz2
audio: fix crashes upon USB device connection
- Audio policy: Replace unknown device assertion by debug log in setDeviceConnectionState(). It is possible that some kernels indicate connection of a legacy device type when a USB audio device is connected. We should just ignore this device. - Audio flinger: Make sure FastMixer thread is idle before exiting the normal mixer thread and closing the output stream. Change-Id: Ia10a20176a60a8aa56765538093a555fc998508a
Diffstat (limited to 'services/audiopolicy/AudioPolicyManager.cpp')
-rw-r--r--services/audiopolicy/AudioPolicyManager.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/services/audiopolicy/AudioPolicyManager.cpp b/services/audiopolicy/AudioPolicyManager.cpp
index aa976b5..3a9c162 100644
--- a/services/audiopolicy/AudioPolicyManager.cpp
+++ b/services/audiopolicy/AudioPolicyManager.cpp
@@ -239,10 +239,14 @@ status_t AudioPolicyManager::setDeviceConnectionState(audio_devices_t device,
// register new device as available
index = mAvailableOutputDevices.add(devDesc);
if (index >= 0) {
- mAvailableOutputDevices[index]->mId = nextUniqueId();
sp<HwModule> module = getModuleForDevice(device);
- ALOG_ASSERT(module != NULL, "setDeviceConnectionState():"
- "could not find HW module for device %08x", device);
+ if (module == 0) {
+ ALOGD("setDeviceConnectionState() could not find HW module for device %08x",
+ device);
+ mAvailableOutputDevices.remove(devDesc);
+ return INVALID_OPERATION;
+ }
+ mAvailableOutputDevices[index]->mId = nextUniqueId();
mAvailableOutputDevices[index]->mModule = module;
} else {
return NO_MEMORY;