summaryrefslogtreecommitdiffstats
path: root/services/audiopolicy/AudioPolicyInterfaceImpl.cpp
diff options
context:
space:
mode:
authorPaul McLean <pmclean@google.com>2015-01-28 11:07:31 -0800
committerPaul McLean <pmclean@google.com>2015-02-05 09:54:20 -0800
commite743a47f445f02a0612018fa5640301304844fbf (patch)
treeb8db2098c4e585e2e4d918db4c01a19fb5cf6be4 /services/audiopolicy/AudioPolicyInterfaceImpl.cpp
parentb96efd3cd7ff49e85049a1515b8bb3b7514dce0b (diff)
downloadframeworks_av-e743a47f445f02a0612018fa5640301304844fbf.zip
frameworks_av-e743a47f445f02a0612018fa5640301304844fbf.tar.gz
frameworks_av-e743a47f445f02a0612018fa5640301304844fbf.tar.bz2
Add additional info to AudioPort for enum/selection API.
Add "device name" member to AudioPort. Moved unique device ID from DevicePort to AudioPort. Straighten out confusion between "name" and "address" Created string constants for Intent "extra" data keys. Combine card/address data into "address" at sender.Add additional info to AudioPort for enum/selection API. Change-Id: I1be308e12b09cd0ead9a3e9fbc9c385462299fb5
Diffstat (limited to 'services/audiopolicy/AudioPolicyInterfaceImpl.cpp')
-rw-r--r--services/audiopolicy/AudioPolicyInterfaceImpl.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/services/audiopolicy/AudioPolicyInterfaceImpl.cpp b/services/audiopolicy/AudioPolicyInterfaceImpl.cpp
index a45dbb3..e9ff838 100644
--- a/services/audiopolicy/AudioPolicyInterfaceImpl.cpp
+++ b/services/audiopolicy/AudioPolicyInterfaceImpl.cpp
@@ -28,7 +28,8 @@ namespace android {
status_t AudioPolicyService::setDeviceConnectionState(audio_devices_t device,
audio_policy_dev_state_t state,
- const char *device_address)
+ const char *device_address,
+ const char *device_name)
{
if (mAudioPolicyManager == NULL) {
return NO_INIT;
@@ -46,8 +47,8 @@ status_t AudioPolicyService::setDeviceConnectionState(audio_devices_t device,
ALOGV("setDeviceConnectionState()");
Mutex::Autolock _l(mLock);
- return mAudioPolicyManager->setDeviceConnectionState(device,
- state, device_address);
+ return mAudioPolicyManager->setDeviceConnectionState(device, state,
+ device_address, device_name);
}
audio_policy_dev_state_t AudioPolicyService::getDeviceConnectionState(