diff options
author | Eric Laurent <elaurent@google.com> | 2015-06-25 11:48:20 -0700 |
---|---|---|
committer | Eric Laurent <elaurent@google.com> | 2015-06-25 11:48:20 -0700 |
commit | cc750d3604b33a92374253b12dd739dc06440aad (patch) | |
tree | d2fb46dbd9994624d5da2dcd6141add90d79d562 /services/audiopolicy/common/managerdefinitions/include | |
parent | ed8505836c0b2fba0ab4be0c1eff31d4f241bc1d (diff) | |
download | frameworks_av-cc750d3604b33a92374253b12dd739dc06440aad.zip frameworks_av-cc750d3604b33a92374253b12dd739dc06440aad.tar.gz frameworks_av-cc750d3604b33a92374253b12dd739dc06440aad.tar.bz2 |
audio policy: fix several device descriptor issues.
- checkOutputsForDevice() should only clear device descriptor attributes
if the device is digital.
- checkInputsForDevice() did not clear device descriptor attributes at all.
- AudioPort::clearCapabilities() and importAudioPort() should not
manage gains as these are device specific.
- importAudioPort() should load a default port config.
Bug: 21990937.
Change-Id: Ida762ed8f9baaabae392cb4291eff1a8d3009751
Diffstat (limited to 'services/audiopolicy/common/managerdefinitions/include')
-rw-r--r-- | services/audiopolicy/common/managerdefinitions/include/AudioPort.h | 2 | ||||
-rw-r--r-- | services/audiopolicy/common/managerdefinitions/include/DeviceDescriptor.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/services/audiopolicy/common/managerdefinitions/include/AudioPort.h b/services/audiopolicy/common/managerdefinitions/include/AudioPort.h index 82e2c43..4fdf5b4 100644 --- a/services/audiopolicy/common/managerdefinitions/include/AudioPort.h +++ b/services/audiopolicy/common/managerdefinitions/include/AudioPort.h @@ -42,7 +42,7 @@ public: virtual void toAudioPort(struct audio_port *port) const; - void importAudioPort(const sp<AudioPort> port); + virtual void importAudioPort(const sp<AudioPort> port); void clearCapabilities(); void loadSamplingRates(char *name); diff --git a/services/audiopolicy/common/managerdefinitions/include/DeviceDescriptor.h b/services/audiopolicy/common/managerdefinitions/include/DeviceDescriptor.h index d1a2f4f..c42ece6 100644 --- a/services/audiopolicy/common/managerdefinitions/include/DeviceDescriptor.h +++ b/services/audiopolicy/common/managerdefinitions/include/DeviceDescriptor.h @@ -44,6 +44,7 @@ public: virtual void attach(const sp<HwModule>& module); virtual void loadGains(cnode *root); virtual void toAudioPort(struct audio_port *port) const; + virtual void importAudioPort(const sp<AudioPort> port); audio_port_handle_t getId() const; audio_devices_t type() const { return mDeviceType; } |