commit d9e5e303c613597ff8b0fc3a15db83ab2cd4ac14
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Oct 30 14:38:58 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 30 14:38:58 2020 +0000
tree 2dc38503914e94c397120c807d4afce0222601ed
parent 1483ad3039c3542b51569fccf30d794d3b1c1fcc
parent a7de85db82b9c25096ea6619b6adf6c4bdd046b0

Merge "keymaster_defs: Add missing tags added in KM 4.1 and earlier."

modules/audio_remote_submix/audio_hw.cpp

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;
 }