mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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

This commit is contained in:
Szu-Yu Chen [:aknow] 2013-10-30 15:07:15 -04:00
Родитель f533368bcd
Коммит 3ecc273f1b
1 изменённых файлов: 13 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

19
dom/bluetooth/BluetoothRilListener.cpp
Просмотреть файл

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