Bug 814625 - Part 9: Bluetooth: Add serviceId in listener. r=gyeh

This commit is contained in:
Szu-Yu Chen [:aknow] 2013-10-31 08:06:28 -04:00
Родитель 1ccbe812aa
Коммит bbf2d765ec
1 изменённых файлов: 13 добавлений и 6 удалений

Просмотреть файл

@ -133,6 +133,8 @@ MobileConnectionListener::NotifyIccChanged()
/**
* TelephonyListener Implementation
*
* TODO: Bug 921991 - B2G BT: support multiple sim cards
*/
class TelephonyListener : public nsITelephonyListener
{
@ -146,7 +148,8 @@ public:
NS_IMPL_ISUPPORTS1(TelephonyListener, nsITelephonyListener)
NS_IMETHODIMP
TelephonyListener::CallStateChanged(uint32_t aCallIndex,
TelephonyListener::CallStateChanged(uint32_t aServiceId,
uint32_t aCallIndex,
uint16_t aCallState,
const nsAString& aNumber,
bool aIsActive,
@ -162,7 +165,8 @@ TelephonyListener::CallStateChanged(uint32_t aCallIndex,
}
NS_IMETHODIMP
TelephonyListener::EnumerateCallState(uint32_t aCallIndex,
TelephonyListener::EnumerateCallState(uint32_t aServiceId,
uint32_t aCallIndex,
uint16_t aCallState,
const nsAString_internal& aNumber,
bool aIsActive,
@ -177,7 +181,8 @@ TelephonyListener::EnumerateCallState(uint32_t aCallIndex,
}
NS_IMETHODIMP
TelephonyListener::NotifyError(int32_t aCallIndex,
TelephonyListener::NotifyError(uint32_t aServiceId,
int32_t aCallIndex,
const nsAString& aError)
{
BluetoothHfpManager* hfp = BluetoothHfpManager::Get();
@ -211,14 +216,16 @@ TelephonyListener::EnumerateCallStateComplete()
}
NS_IMETHODIMP
TelephonyListener::SupplementaryServiceNotification(int32_t aCallIndex,
TelephonyListener::SupplementaryServiceNotification(uint32_t aServiceId,
int32_t aCallIndex,
uint16_t aNotification)
{
return NS_OK;
}
NS_IMETHODIMP
TelephonyListener::NotifyCdmaCallWaiting(const nsAString& aNumber)
TelephonyListener::NotifyCdmaCallWaiting(uint32_t aServiceId,
const nsAString& aNumber)
{
BluetoothHfpManager* hfp = BluetoothHfpManager::Get();
hfp->UpdateSecondNumber(aNumber);
@ -339,4 +346,4 @@ BluetoothRilListener::StopTelephonyListening()
nsresult rv = provider->UnregisterListener(mTelephonyListener);
return NS_SUCCEEDED(rv);
}
}