diff options
| author | Eric Laurent <elaurent@google.com> | 2015-04-03 15:57:54 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2015-04-08 12:37:35 -0700 |
| commit | 322b4d25387a04c9afebe998326d005bbdf17ede (patch) | |
| tree | 3cf0c2912dc7cb75acb60526bef382dd90e9a51d /services/audiopolicy/enginedefault | |
| parent | 6dc4dc4ad23dc82eca9af3112292f3e6d5b17b15 (diff) | |
| download | frameworks_av-322b4d25387a04c9afebe998326d005bbdf17ede.zip frameworks_av-322b4d25387a04c9afebe998326d005bbdf17ede.tar.gz frameworks_av-322b4d25387a04c9afebe998326d005bbdf17ede.tar.bz2 | |
audio policy: fix unique audio port ID.
Remove mId member from AudioPort as it was shadowed
by mId in DeviceDescriptor.
Add getters for Id, and HW module name and version to device,
output and input descriptors.
Fix DeviceDescriptor name initialization.
Change-Id: I4a69f385e40330954d9dad5f2926c521f60b2ec1
Diffstat (limited to 'services/audiopolicy/enginedefault')
| -rwxr-xr-x | services/audiopolicy/enginedefault/src/Engine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/audiopolicy/enginedefault/src/Engine.cpp b/services/audiopolicy/enginedefault/src/Engine.cpp index 1fd3341..417eebc 100755 --- a/services/audiopolicy/enginedefault/src/Engine.cpp +++ b/services/audiopolicy/enginedefault/src/Engine.cpp @@ -358,7 +358,7 @@ audio_devices_t Engine::getDeviceForStrategy(routing_strategy strategy) const if (((availableInputDevices.types() & AUDIO_DEVICE_IN_TELEPHONY_RX & ~AUDIO_DEVICE_BIT_IN) == 0) || (((txDevice & availPrimaryInputDevices & ~AUDIO_DEVICE_BIT_IN) != 0) && - (primaryOutput->getAudioPort()->mModule->mHalVersion < + (primaryOutput->getAudioPort()->getModuleVersion() < AUDIO_DEVICE_API_VERSION_3_0))) { availableOutputDevicesType = availPrimaryOutputDevices; } |