diff options
| author | Paul McLean <pmclean@google.com> | 2015-02-06 13:53:36 -0800 |
|---|---|---|
| committer | Paul McLean <pmclean@google.com> | 2015-02-06 14:44:32 -0800 |
| commit | e8610ba233ecdb3f6d3259412b41738a3861ee7e (patch) | |
| tree | 733694eb052a9bd41b53f7dffc77738abf11d057 /services/audiopolicy | |
| parent | 9fdb3bd42af0876a9b76bae42d7aba2287b53af4 (diff) | |
| download | frameworks_av-e8610ba233ecdb3f6d3259412b41738a3861ee7e.zip frameworks_av-e8610ba233ecdb3f6d3259412b41738a3861ee7e.tar.gz frameworks_av-e8610ba233ecdb3f6d3259412b41738a3861ee7e.tar.bz2 | |
Passing device name up through getDeviceDescriptor() method (when creating)
Change-Id: Ibd85e37914333478fd038c3d2f52e214016c16b1
Diffstat (limited to 'services/audiopolicy')
| -rw-r--r-- | services/audiopolicy/AudioPolicyManager.cpp | 12 | ||||
| -rw-r--r-- | services/audiopolicy/AudioPolicyManager.h | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/services/audiopolicy/AudioPolicyManager.cpp b/services/audiopolicy/AudioPolicyManager.cpp index 5a0c958..50ea6ff 100644 --- a/services/audiopolicy/AudioPolicyManager.cpp +++ b/services/audiopolicy/AudioPolicyManager.cpp @@ -230,9 +230,7 @@ status_t AudioPolicyManager::setDeviceConnectionStateInt(audio_devices_t device, // connect/disconnect only 1 device at a time if (!audio_is_output_device(device) && !audio_is_input_device(device)) return BAD_VALUE; - sp<DeviceDescriptor> devDesc = getDeviceDescriptor(device, device_address); - - String8 name = String8(device_name != NULL ? device_name : ""); + sp<DeviceDescriptor> devDesc = getDeviceDescriptor(device, device_address, device_name); // handle output devices if (audio_is_output_device(device)) { @@ -434,7 +432,7 @@ status_t AudioPolicyManager::setDeviceConnectionStateInt(audio_devices_t device, audio_policy_dev_state_t AudioPolicyManager::getDeviceConnectionState(audio_devices_t device, const char *device_address) { - sp<DeviceDescriptor> devDesc = getDeviceDescriptor(device, device_address); + sp<DeviceDescriptor> devDesc = getDeviceDescriptor(device, device_address, ""); DeviceVector *deviceVector; if (audio_is_output_device(device)) { @@ -456,7 +454,8 @@ audio_policy_dev_state_t AudioPolicyManager::getDeviceConnectionState(audio_devi sp<AudioPolicyManager::DeviceDescriptor> AudioPolicyManager::getDeviceDescriptor( const audio_devices_t device, - const char *device_address) + const char *device_address, + const char *device_name) { String8 address = (device_address == NULL) ? String8("") : String8(device_address); // handle legacy remote submix case where the address was not always specified @@ -479,7 +478,8 @@ sp<AudioPolicyManager::DeviceDescriptor> AudioPolicyManager::getDeviceDescripto } } - sp<DeviceDescriptor> devDesc = new DeviceDescriptor(String8(""), device); + sp<DeviceDescriptor> devDesc = + new DeviceDescriptor(String8(device_name != NULL ? device_name : ""), device); devDesc->mAddress = address; return devDesc; } diff --git a/services/audiopolicy/AudioPolicyManager.h b/services/audiopolicy/AudioPolicyManager.h index 3e3c662..81d4f14 100644 --- a/services/audiopolicy/AudioPolicyManager.h +++ b/services/audiopolicy/AudioPolicyManager.h @@ -944,7 +944,8 @@ private: const char *device_address, const char *device_name); sp<DeviceDescriptor> getDeviceDescriptor(const audio_devices_t device, - const char *device_address); + const char *device_address, + const char *device_name); }; }; |