| commit | cb137d0ead90f63e9b67bd9af21425b32ebc150d | [log] [tgz] |
|---|---|---|
| author | Nick Desaulniers <ndesaulniers@google.com> | Tue Oct 15 18:30:45 2019 -0700 |
| committer | Nick Desaulniers <ndesaulniers@google.com> | Mon Oct 21 10:55:49 2019 -0700 |
| tree | aac38fef56e7fc6051426395922088854f4a03ad | |
| parent | c52243f298aa3e570197831c8c383fdedb8f4ac6 [diff] [blame] |
[audiopolicy] fix -Wreorder-init-list C++20 will require members in a designated initializer to be in order unlike C99. Bug: 139945549 Test: mm Change-Id: I610f4e8a8a9d69eb650c354df4bd1438a1408897 Merged-In: Ie129344a36893adc82e67181012e3af817bda9f4 Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp index 83ae35e..b0b63d9 100644 --- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp +++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -1086,8 +1086,9 @@ } audio_config_base_t clientConfig = {.sample_rate = config->sample_rate, + .channel_mask = config->channel_mask, .format = config->format, - .channel_mask = config->channel_mask }; + }; *portId = AudioPort::getNextUniqueId(); sp<TrackClientDescriptor> clientDesc =