From addb2c56fc185ef9f9144edb132a7609ed032da1 Mon Sep 17 00:00:00 2001
From: Eric Laurent <elaurent@google.com>
Date: Fri, 25 Sep 2009 10:21:16 -0700
Subject: [PATCH] Fix issue 2146459:AudioPolicyManager: notification and
 ringtone streams can remain muted.

The fix consists in adding a parameter to handleIncallSonification() indicating that it is called from setPhoneState() in which case the stream mute or unmute is called as many times as there are active tracks on the output.

Also change the time when handleIncallSonification() is called in setPhoneState() to make sure that both mPhoneSate and the selected device are coherent with the IN_CALL state when the fucntion is called.