commit | 399c153d2c988c5d61d79c06e0651ad078e46d23 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Dec 06 00:40:51 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 06 00:40:51 2023 +0000 |
tree | 4795b9869783b79cb1acaa0dcde61baa1667c4c6 | |
parent | 000eea305135c59ee37ef7419c20f8534696d916 [diff] | |
parent | 27cf27f23a844af8efce20a01e496d545de475d0 [diff] |
Merge "AudioPort.h: Fix Compiler Warning" into main am: 27cf27f23a Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2861165 Change-Id: Id3dda237ca881ae09017c895b205a9c3ab6f3034 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/libaudiofoundation/include/media/AudioPort.h b/media/libaudiofoundation/include/media/AudioPort.h index 77e58ed..5786f7f 100644 --- a/media/libaudiofoundation/include/media/AudioPort.h +++ b/media/libaudiofoundation/include/media/AudioPort.h
@@ -48,7 +48,10 @@ audio_port_role_t getRole() const { return mRole; } virtual void setFlags(uint32_t flags); - uint32_t getFlags() const { return useInputChannelMask() ? mFlags.input : mFlags.output; } + uint32_t getFlags() const { + return useInputChannelMask() ? static_cast<uint32_t>(mFlags.input) + : static_cast<uint32_t>(mFlags.output); + } void setGains(const AudioGains &gains) { mGains = gains; } const AudioGains &getGains() const { return mGains; }