commit | 1483ad3039c3542b51569fccf30d794d3b1c1fcc | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Oct 20 21:08:02 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 20 21:08:02 2020 +0000 |
tree | 1db18bb37ffd5a1984682ddc02fab8cfe53fa13d | |
parent | f07217e43abb6677d0def1913c1a97bffc86e45b [diff] | |
parent | 07be88006854e0fbe5c2d1e8adcef10b757f3bd3 [diff] |
[automerger skipped] Merge "Merge redfin/bramble support." am: 52e9473f1e -s ours am: 11e52152dd -s ours am: 9dddd731ac -s ours am: 07be880068 -s ours am skip reason: Change-Id Icce4e4f44a811726f76a8602a44e9060cc1dbaa1 with SHA-1 3109cbe663 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1465935 Change-Id: I78c7401049f8d51f5db53cf20780da97517573b4
diff --git a/modules/audio_remote_submix/audio_hw.cpp b/modules/audio_remote_submix/audio_hw.cpp index 103f57d..72e1fa5 100644 --- a/modules/audio_remote_submix/audio_hw.cpp +++ b/modules/audio_remote_submix/audio_hw.cpp
@@ -675,7 +675,8 @@ { const struct submix_stream_out * const out = audio_stream_get_submix_stream_out( const_cast<struct audio_stream *>(stream)); - uint32_t channel_mask = out->dev->routes[out->route_handle].config.output_channel_mask; + audio_channel_mask_t channel_mask = + out->dev->routes[out->route_handle].config.output_channel_mask; SUBMIX_ALOGV("out_get_channels() returns %08x", channel_mask); return channel_mask; }