diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-11-14 15:43:18 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-14 15:43:19 -0800 |
| commit | acc8706f91f799ea63c10ecad4959c55e0873d93 (patch) | |
| tree | f2c948135374604625957a9a4ac19626407c6c2d /media | |
| parent | 30ca3be314993fb4155bee1a17a4b76354cd6ef9 (diff) | |
| parent | b26e3e9f2ab0334bff21a4fa4851dbf6e57fba5d (diff) | |
| download | frameworks_av-acc8706f91f799ea63c10ecad4959c55e0873d93.zip frameworks_av-acc8706f91f799ea63c10ecad4959c55e0873d93.tar.gz frameworks_av-acc8706f91f799ea63c10ecad4959c55e0873d93.tar.bz2 | |
Merge "Fix build warnings"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/IAudioFlinger.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/IAudioFlinger.cpp b/media/libmedia/IAudioFlinger.cpp index bb936ec..55658db 100644 --- a/media/libmedia/IAudioFlinger.cpp +++ b/media/libmedia/IAudioFlinger.cpp @@ -106,7 +106,7 @@ public: data.writeInt32(format); data.writeInt32(channelMask); data.writeInt32(frameCount); - track_flags_t lFlags = flags != NULL ? *flags : TRACK_DEFAULT; + track_flags_t lFlags = flags != NULL ? *flags : (track_flags_t) TRACK_DEFAULT; data.writeInt32(lFlags); data.writeStrongBinder(sharedBuffer->asBinder()); data.writeInt32((int32_t) output); |