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 | a9749e3468fda2288dda65d1ef52e0997f6d8897 (patch) | |
| tree | fd8b050956aca1d253a7770fface302ce8e08f61 /media | |
| parent | 656130a7bcff790dc9311754189d46bd4b911fbf (diff) | |
| parent | 98d9922247ef21b0faf8c7d817650b8327052a4a (diff) | |
| download | frameworks_av-a9749e3468fda2288dda65d1ef52e0997f6d8897.zip frameworks_av-a9749e3468fda2288dda65d1ef52e0997f6d8897.tar.gz frameworks_av-a9749e3468fda2288dda65d1ef52e0997f6d8897.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); |