From 4356269be6d2b62bbb945364e8fc4beb99e1aada Mon Sep 17 00:00:00 2001
From: Eric Laurent <elaurent@google.com>
Date: Wed, 15 Jul 2015 16:49:07 -0700
Subject: 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
---
 media/libmediaplayerservice/MediaPlayerService.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'media/libmediaplayerservice/MediaPlayerService.h')

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);
 
-- 
cgit v1.1