summaryrefslogtreecommitdiffstats
path: root/services/audiopolicy/common/managerdefinitions/include/AudioPort.h
diff options
context:
space:
mode:
authorAndy Hung <hunga@google.com>2015-04-22 10:17:59 -0700
committerAndy Hung <hunga@google.com>2015-04-23 13:52:46 -0700
commit138f77425a0956d867f078881f91628518ae8258 (patch)
treea8e3afaf98d7d32d04d5aab3a72354e04334614b /services/audiopolicy/common/managerdefinitions/include/AudioPort.h
parent1ac91ed2c67245ea5052182212463d3f0afe8b5a (diff)
downloadframeworks_av-138f77425a0956d867f078881f91628518ae8258.zip
frameworks_av-138f77425a0956d867f078881f91628518ae8258.tar.gz
frameworks_av-138f77425a0956d867f078881f91628518ae8258.tar.bz2
Fix format sorting order in AudioPort
Otherwise AUDIO_FORMAT_DEFAULT (used for dynamic formats) is no longer the first entry. Change-Id: I23869a9ca2ed138759d722e7c9838497f640921a
Diffstat (limited to 'services/audiopolicy/common/managerdefinitions/include/AudioPort.h')
-rw-r--r--services/audiopolicy/common/managerdefinitions/include/AudioPort.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/services/audiopolicy/common/managerdefinitions/include/AudioPort.h b/services/audiopolicy/common/managerdefinitions/include/AudioPort.h
index 1c2c27e..82e2c43 100644
--- a/services/audiopolicy/common/managerdefinitions/include/AudioPort.h
+++ b/services/audiopolicy/common/managerdefinitions/include/AudioPort.h
@@ -75,10 +75,8 @@ public:
audio_format_t pickFormat() const;
static const audio_format_t sPcmFormatCompareTable[];
- static int compareFormatsGoodToBad(
- const audio_format_t *format1, const audio_format_t *format2) {
- // compareFormats sorts from bad to good, we reverse it here
- return compareFormats(*format2, *format1);
+ static int compareFormats(const audio_format_t *format1, const audio_format_t *format2) {
+ return compareFormats(*format1, *format2);
}
static int compareFormats(audio_format_t format1, audio_format_t format2);