From 7288ab87a7aa730ffe97d7dc7e118123107bfcea Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Wed, 6 May 2015 18:44:02 -0700 Subject: audio policy: clarify use of mName field for audio devices The audio port field mName was used for two different purposes which caused a problem when exposing this information at the SDK API. Create a new "mTag" field storing the audio_policy.conf device tag if needed. Field "mName" is now used to store any additional name associated to a given device when available (e.g Manufacturer and model name for a USB device). Change-Id: I17fa872e4a3a2e1b7cbb807c6f72e095a8a2c9c5 --- services/audiopolicy/managerdefault/AudioPolicyManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'services/audiopolicy/managerdefault') diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp index b7eed62..0c02d93 100644 --- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp +++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp @@ -2648,7 +2648,7 @@ AudioPolicyManager::AudioPolicyManager(AudioPolicyClientInterface *clientInterfa mUidCached = getuid(); mpClientInterface = clientInterface; - mDefaultOutputDevice = new DeviceDescriptor(String8("Speaker"), AUDIO_DEVICE_OUT_SPEAKER); + mDefaultOutputDevice = new DeviceDescriptor(AUDIO_DEVICE_OUT_SPEAKER); if (ConfigParsingUtils::loadAudioPolicyConfig(AUDIO_POLICY_VENDOR_CONFIG_FILE, mHwModules, mAvailableInputDevices, mAvailableOutputDevices, mDefaultOutputDevice, mSpeakerDrcEnabled) != NO_ERROR) { @@ -4738,7 +4738,7 @@ void AudioPolicyManager::defaultAudioPolicyConfig(void) sp module; sp profile; sp defaultInputDevice = - new DeviceDescriptor(String8("builtin-mic"), AUDIO_DEVICE_IN_BUILTIN_MIC); + new DeviceDescriptor(AUDIO_DEVICE_IN_BUILTIN_MIC); mAvailableOutputDevices.add(mDefaultOutputDevice); mAvailableInputDevices.add(defaultInputDevice); -- cgit v1.1