diff options
| author | Eric Laurent <elaurent@google.com> | 2015-07-16 00:25:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-16 00:25:38 +0000 |
| commit | a8dc93efc9be8d5e37c7473601fb8654804188c1 (patch) | |
| tree | 3711e25321d019cb2ad0fbcbf8ccfa437918b0f9 /media/libmediaplayerservice/MediaPlayerService.h | |
| parent | 3d6a3ede377833d5f4fc40daab6cd958543a5fb0 (diff) | |
| parent | 4356269be6d2b62bbb945364e8fc4beb99e1aada (diff) | |
| download | frameworks_av-a8dc93efc9be8d5e37c7473601fb8654804188c1.zip frameworks_av-a8dc93efc9be8d5e37c7473601fb8654804188c1.tar.gz frameworks_av-a8dc93efc9be8d5e37c7473601fb8654804188c1.tar.bz2 | |
Merge "mediaplayer: fix audio attributes override by stream type" into mnc-dev
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.h')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h index 9e6ca52..1c32597 100644 --- a/media/libmediaplayerservice/MediaPlayerService.h +++ b/media/libmediaplayerservice/MediaPlayerService.h @@ -107,8 +107,7 @@ class MediaPlayerService : public BnMediaPlayerService virtual void flush(); virtual void pause(); virtual void close(); - void setAudioStreamType(audio_stream_type_t streamType) { - mStreamType = streamType; } + void setAudioStreamType(audio_stream_type_t streamType); virtual audio_stream_type_t getAudioStreamType() const { return mStreamType; } void setAudioAttributes(const audio_attributes_t * attributes); |