diff options
| author | Eric Laurent <elaurent@google.com> | 2015-07-15 16:49:07 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2015-07-15 16:49:07 -0700 |
| commit | 4356269be6d2b62bbb945364e8fc4beb99e1aada (patch) | |
| tree | f2ef8b7a7f84fe3901333cf2784711bd1dc6b769 /media/libmediaplayerservice/MediaPlayerService.h | |
| parent | 4b33e0838fdb1b5e545449add02005916b512c99 (diff) | |
| download | frameworks_av-4356269be6d2b62bbb945364e8fc4beb99e1aada.zip frameworks_av-4356269be6d2b62bbb945364e8fc4beb99e1aada.tar.gz frameworks_av-4356269be6d2b62bbb945364e8fc4beb99e1aada.tar.bz2 | |
mediaplayer: fix audio attributes override by stream type
Make sure that when audio attributes are set, the stream type
is always derived from them.
Bug: 22481669.
Change-Id: Ia10c7017eb27e7753faf97a42dd4f44e15f2c986
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); |