Bug 981519 - Number and name presentation - part 5 - BT module. r=btian, a=lmandel
authorHsin-Yi Tsai <htsai@mozilla.com>
Thu, 17 Apr 2014 11:46:03 +0800
changeset 207979 78de1ef8227512642ccea70cfa604e241d5267e7
parent 207978 9b97219e07313c430373fc3f277678000d7c7809
child 207980 ded8f0cbc05f68d351768e100a1071dfad8443f8
push id3741
push userasasaki@mozilla.com
push dateMon, 21 Jul 2014 20:25:18 +0000
treeherdermozilla-beta@4d6f46f5af68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbtian, lmandel
bugs981519
milestone32.0a2
Bug 981519 - Number and name presentation - part 5 - BT module. r=btian, a=lmandel
dom/bluetooth/BluetoothRilListener.cpp
--- a/dom/bluetooth/BluetoothRilListener.cpp
+++ b/dom/bluetooth/BluetoothRilListener.cpp
@@ -176,16 +176,19 @@ MobileConnectionListener::Listen(bool aS
  */
 NS_IMPL_ISUPPORTS(TelephonyListener, nsITelephonyListener)
 
 NS_IMETHODIMP
 TelephonyListener::CallStateChanged(uint32_t aServiceId,
                                     uint32_t aCallIndex,
                                     uint16_t aCallState,
                                     const nsAString& aNumber,
+                                    uint16_t aNumberPresentation,
+                                    const nsAString& aName,
+                                    uint16_t aNamePresentation,
                                     bool aIsOutgoing,
                                     bool aIsEmergency,
                                     bool aIsConference,
                                     bool aIsSwitchable,
                                     bool aIsMergeable)
 {
   BluetoothHfpManager* hfp = BluetoothHfpManager::Get();
   NS_ENSURE_TRUE(hfp, NS_ERROR_FAILURE);
@@ -195,16 +198,19 @@ TelephonyListener::CallStateChanged(uint
   return NS_OK;
 }
 
 NS_IMETHODIMP
 TelephonyListener::EnumerateCallState(uint32_t aServiceId,
                                       uint32_t aCallIndex,
                                       uint16_t aCallState,
                                       const nsAString_internal& aNumber,
+                                      uint16_t aNumberPresentation,
+                                      const nsAString& aName,
+                                      uint16_t aNamePresentation,
                                       bool aIsOutgoing,
                                       bool aIsEmergency,
                                       bool aIsConference,
                                       bool aIsSwitchable,
                                       bool aIsMergeable)
 {
   BluetoothHfpManager* hfp = BluetoothHfpManager::Get();
   NS_ENSURE_TRUE(hfp, NS_ERROR_FAILURE);
@@ -265,17 +271,20 @@ TelephonyListener::NotifyConferenceError
   BT_WARNING(NS_ConvertUTF16toUTF8(aName).get());
   BT_WARNING(NS_ConvertUTF16toUTF8(aMessage).get());
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
 TelephonyListener::NotifyCdmaCallWaiting(uint32_t aServiceId,
-                                         const nsAString& aNumber)
+                                         const nsAString& aNumber,
+                                         uint16_t aNumberPresentation,
+                                         const nsAString& aName,
+                                         uint16_t aNamePresentation)
 {
   BluetoothHfpManager* hfp = BluetoothHfpManager::Get();
   NS_ENSURE_TRUE(hfp, NS_ERROR_FAILURE);
 
   hfp->UpdateSecondNumber(aNumber);
 
   return NS_OK;
 }