| commit | daaddc8ff723ae9681d560c50816093be08009f2 | [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 | 2c2b4ae456cc6050aaca2d5d85163e324d1428ec | |
| parent | cb3deffdaf2c7d7abcd1ca10cf44c74683deb5aa [diff] | |
| parent | d140a24c72cc5a1d21e4366ca7062491f70cb1d4 [diff] |
Merge "Convert mask types from uint32_t to enum type" am: d140a24c72 Original change: https://android-review.googlesource.com/c/platform/frameworks/wilhelm/+/1510590 Change-Id: I1c05e70cd5207ad554eca2b45a494302e94d6845
diff --git a/src/android/channels.cpp b/src/android/channels.cpp index 6f0434f..f0eeb7c 100644 --- a/src/android/channels.cpp +++ b/src/android/channels.cpp
@@ -192,7 +192,7 @@ SL_LOGE("Unrecognized channel representation %#x", rep); } - uint32_t result = audio_channel_mask_from_representation_and_bits( + audio_channel_mask_t result = audio_channel_mask_from_representation_and_bits( rep, bitsOut);