diff options
| author | Hochi Huang <hochi.huang@mediatek.com> | 2014-12-05 16:25:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-05 16:25:49 +0000 |
| commit | bfe1f3605c532ff2681458fe635beb8c47289205 (patch) | |
| tree | 5fc82175e1cf2ea89cf62628814a0cd1a10718c5 /services | |
| parent | 3e715975a59f83084355ef600106d615a4f7f13f (diff) | |
| parent | 9f104ea6d1123199f1f2e88934fae939c112a9b3 (diff) | |
| download | frameworks_av-bfe1f3605c532ff2681458fe635beb8c47289205.zip frameworks_av-bfe1f3605c532ff2681458fe635beb8c47289205.tar.gz frameworks_av-bfe1f3605c532ff2681458fe635beb8c47289205.tar.bz2 | |
am 9f104ea6: am 94d91778: am 18f2f90c: [FM] Fix Buganizer ID: 18456930 - FM radio audio got routed to loudspeaker unexpectedly
* commit '9f104ea6d1123199f1f2e88934fae939c112a9b3':
[FM] Fix Buganizer ID: 18456930 - FM radio audio got routed to loudspeaker unexpectedly
Diffstat (limited to 'services')
| -rw-r--r-- | services/audiopolicy/AudioPolicyManager.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/audiopolicy/AudioPolicyManager.h b/services/audiopolicy/AudioPolicyManager.h index e2b6480..17348e9 100644 --- a/services/audiopolicy/AudioPolicyManager.h +++ b/services/audiopolicy/AudioPolicyManager.h @@ -722,7 +722,7 @@ protected: // if muting, wait for the audio in pcm buffer to be drained before proceeding // if unmuting, unmute only after the specified delay // Returns the number of ms waited - uint32_t checkDeviceMuteStrategies(sp<AudioOutputDescriptor> outputDesc, + virtual uint32_t checkDeviceMuteStrategies(sp<AudioOutputDescriptor> outputDesc, audio_devices_t prevDevice, uint32_t delayMs); |