diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-04-01 22:40:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-01 22:40:05 +0000 |
| commit | d4d55cdf31a3faa619bfa043f5b0f170f6ffd139 (patch) | |
| tree | e1931025bb3db237ddf60e352488b1c4b1c91eef /services/audiopolicy/common/managerdefinitions/src/HwModule.cpp | |
| parent | da2246b54e3eed9e9366c98688b19f997d869e79 (diff) | |
| parent | 887a9ed4446cb451181c392a0e51a69914e58fbf (diff) | |
| download | frameworks_av-d4d55cdf31a3faa619bfa043f5b0f170f6ffd139.zip frameworks_av-d4d55cdf31a3faa619bfa043f5b0f170f6ffd139.tar.gz frameworks_av-d4d55cdf31a3faa619bfa043f5b0f170f6ffd139.tar.bz2 | |
Merge "Updates to AudioPolicyManager refactor"
Diffstat (limited to 'services/audiopolicy/common/managerdefinitions/src/HwModule.cpp')
| -rw-r--r-- | services/audiopolicy/common/managerdefinitions/src/HwModule.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp b/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp index 8004303..0097d69 100644 --- a/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp +++ b/services/audiopolicy/common/managerdefinitions/src/HwModule.cpp @@ -142,7 +142,7 @@ status_t HwModule::loadDevice(cnode *root) audio_devices_t type = AUDIO_DEVICE_NONE; while (node) { - if (strcmp(node->name, DEVICE_TYPE) == 0) { + if (strcmp(node->name, APM_DEVICE_TYPE) == 0) { type = ConfigParsingUtils::parseDeviceNames((char *)node->value); break; } @@ -158,7 +158,7 @@ status_t HwModule::loadDevice(cnode *root) node = root->first_child; while (node) { - if (strcmp(node->name, DEVICE_ADDRESS) == 0) { + if (strcmp(node->name, APM_DEVICE_ADDRESS) == 0) { deviceDesc->mAddress = String8((char *)node->value); } else if (strcmp(node->name, CHANNELS_TAG) == 0) { if (audio_is_input_device(type)) { |