| commit | 147848153321f05f8c30879ad24a73fdca5c84b6 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Dec 01 17:42:20 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 01 17:42:20 2020 +0000 |
| tree | 4b0df03d810cf5e1b7e0b7c9a695f873e6a74540 | |
| parent | 6e1b4e18f2527deb6d5eb26cef5b45ff58f46a3d [diff] | |
| parent | 30a37a7a4b03493ffe14f105eec2ce55b1de21d7 [diff] |
Merge "Convert mask types from uint32_t to enum type" am: 30a37a7a4b Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1510315 Change-Id: I22c02105575c30900259ecfa360125ba5cacced5
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; }