Bug 814625 - Part 5: DOM: Add multisim support. r=khuey

dom/telephony/Telephony.cpp

@@ -12,6 +12,7 @@
 #include "nsIPermissionManager.h"
 
 #include "mozilla/dom/UnionTypes.h"
+#include "mozilla/Preferences.h"
 #include "nsCharSeparatedTokenizer.h"
 #include "nsContentUtils.h"
 #include "nsCxPusher.h"
@@ -182,6 +183,19 @@ Telephony::IsValidNumber(const nsAString& aNumber)
   return !aNumber.IsEmpty();
 }
 
+// static
+uint32_t
+Telephony::GetNumServices() {
+  return mozilla::Preferences::GetInt("ril.numRadioInterfaces", 1);
+}
+
+// static
+bool
+Telephony::IsValidServiceId(uint32_t aServiceId)
+{
+  return aServiceId < GetNumServices();
+}
+
 // static
 bool
 Telephony::IsActiveState(uint16_t aCallState) {
@@ -190,6 +204,14 @@ Telephony::IsActiveState(uint16_t aCallState) {
       aCallState == nsITelephonyProvider::CALL_STATE_CONNECTED;
 }
 
+uint32_t
+Telephony::ProvidedOrDefaultServiceId(const Optional<uint32_t>& aServiceId)
+{
+  uint32_t serviceId = 0;
+  return aServiceId.WasPassed() ? aServiceId.Value()
+                                : mProvider->GetDefaultServiceId(&serviceId);
+}
+
 bool
 Telephony::HasDialingCall()
 {
@@ -209,15 +231,15 @@ bool
 Telephony::MatchActiveCall(TelephonyCall* aCall)
 {
   return (mActiveCall &&
-          mActiveCall->CallIndex() == aCall->CallIndex());
+          mActiveCall->CallIndex() == aCall->CallIndex() &&
+          mActiveCall->ServiceId() == aCall->ServiceId());
 }
 
 already_AddRefed<TelephonyCall>
-Telephony::DialInternal(bool isEmergency,
+Telephony::DialInternal(uint32_t aServiceId, const nsAString& aNumber,
-                        const nsAString& aNumber,
+                        bool aIsEmergency, ErrorResult& aRv)
-                        ErrorResult& aRv)
 {
-  if (!IsValidNumber(aNumber)) {
+  if (!IsValidNumber(aNumber) || !IsValidServiceId(aServiceId)) {
     aRv.Throw(NS_ERROR_INVALID_ARG);
     return nullptr;
   }
@@ -229,20 +251,20 @@ Telephony::DialInternal(bool isEmergency,
     return nullptr;
   }
 
-  nsresult rv = mProvider->Dial(aNumber, isEmergency);
+  nsresult rv = mProvider->Dial(aServiceId, aNumber, aIsEmergency);
   if (NS_FAILED(rv)) {
     aRv.Throw(rv);
     return nullptr;
   }
 
-  nsRefPtr<TelephonyCall> call = CreateNewDialingCall(aNumber);
+  nsRefPtr<TelephonyCall> call = CreateNewDialingCall(aServiceId, aNumber);
 
   // Notify other telephony objects that we just dialed.
   for (uint32_t i = 0; i < gTelephonyList->Length(); i++) {
     Telephony*& telephony = gTelephonyList->ElementAt(i);
     if (telephony != this) {
       nsRefPtr<Telephony> kungFuDeathGrip = telephony;
-      telephony->NoteDialedCallFromOtherInstance(aNumber);
+      telephony->NoteDialedCallFromOtherInstance(aServiceId, aNumber);
     }
   }
 
@@ -250,10 +272,10 @@ Telephony::DialInternal(bool isEmergency,
 }
 
 already_AddRefed<TelephonyCall>
-Telephony::CreateNewDialingCall(const nsAString& aNumber)
+Telephony::CreateNewDialingCall(uint32_t aServiceId, const nsAString& aNumber)
 {
   nsRefPtr<TelephonyCall> call =
-    TelephonyCall::Create(this, aNumber,
+    TelephonyCall::Create(this, aServiceId, aNumber,
                           nsITelephonyProvider::CALL_STATE_DIALING);
   NS_ASSERTION(call, "This should never fail!");
 
@@ -263,10 +285,11 @@ Telephony::CreateNewDialingCall(const nsAString& aNumber)
 }
 
 void
-Telephony::NoteDialedCallFromOtherInstance(const nsAString& aNumber)
+Telephony::NoteDialedCallFromOtherInstance(uint32_t aServiceId,
+                                           const nsAString& aNumber)
 {
   // We don't need to hang on to this call object, it is held alive by mCalls.
-  nsRefPtr<TelephonyCall> call = CreateNewDialingCall(aNumber);
+  nsRefPtr<TelephonyCall> call = CreateNewDialingCall(aServiceId, aNumber);
 }
 
 nsresult
@@ -286,13 +309,14 @@ Telephony::UpdateActiveCall(TelephonyCall* aCall, bool aIsActive)
 }
 
 already_AddRefed<TelephonyCall>
-Telephony::GetCall(uint32_t aCallIndex)
+Telephony::GetCall(uint32_t aServiceId, uint32_t aCallIndex)
 {
   nsRefPtr<TelephonyCall> call;
 
-  for (uint32_t index = 0; index < mCalls.Length(); index++) {
+  for (uint32_t i = 0; i < mCalls.Length(); i++) {
-    nsRefPtr<TelephonyCall>& tempCall = mCalls[index];
+    nsRefPtr<TelephonyCall>& tempCall = mCalls[i];
-    if (tempCall->CallIndex() == aCallIndex) {
+    if (tempCall->ServiceId() == aServiceId &&
+        tempCall->CallIndex() == aCallIndex) {
       call = tempCall;
       break;
     }
@@ -322,12 +346,12 @@ Telephony::GetOutgoingCall()
 }
 
 already_AddRefed<TelephonyCall>
-Telephony::GetCallFromEverywhere(uint32_t aCallIndex)
+Telephony::GetCallFromEverywhere(uint32_t aServiceId, uint32_t aCallIndex)
 {
-  nsRefPtr<TelephonyCall> call = GetCall(aCallIndex);
+  nsRefPtr<TelephonyCall> call = GetCall(aServiceId, aCallIndex);
 
   if (!call) {
-    call = mGroup->GetCall(aCallIndex);
+    call = mGroup->GetCall(aServiceId, aCallIndex);
   }
 
   return call.forget();
@@ -362,39 +386,55 @@ NS_IMPL_ISUPPORTS1(Telephony::Listener, nsITelephonyListener)
 // Telephony WebIDL
 
 already_AddRefed<TelephonyCall>
-Telephony::Dial(const nsAString& aNumber, ErrorResult& aRv)
+Telephony::Dial(const nsAString& aNumber, const Optional<uint32_t>& aServiceId,
+                ErrorResult& aRv)
 {
-  nsRefPtr<TelephonyCall> call = DialInternal(false, aNumber, aRv);
+  uint32_t serviceId = ProvidedOrDefaultServiceId(aServiceId);
+  nsRefPtr<TelephonyCall> call = DialInternal(serviceId, aNumber, false, aRv);
   return call.forget();
 }
 
 already_AddRefed<TelephonyCall>
-Telephony::DialEmergency(const nsAString& aNumber, ErrorResult& aRv)
+Telephony::DialEmergency(const nsAString& aNumber,
+                         const Optional<uint32_t>& aServiceId,
+                         ErrorResult& aRv)
 {
-  nsRefPtr<TelephonyCall> call = DialInternal(true, aNumber, aRv);
+  uint32_t serviceId = ProvidedOrDefaultServiceId(aServiceId);
+  nsRefPtr<TelephonyCall> call = DialInternal(serviceId, aNumber, true, aRv);
   return call.forget();
 }
 
 void
-Telephony::StartTone(const nsAString& aDTMFChar, ErrorResult& aRv)
+Telephony::StartTone(const nsAString& aDTMFChar,
+                     const Optional<uint32_t>& aServiceId,
+                     ErrorResult& aRv)
 {
+  uint32_t serviceId = ProvidedOrDefaultServiceId(aServiceId);
+
   if (aDTMFChar.IsEmpty()) {
     NS_WARNING("Empty tone string will be ignored");
     return;
   }
 
-  if (aDTMFChar.Length() > 1) {
+  if (aDTMFChar.Length() > 1 || !IsValidServiceId(serviceId)) {
     aRv.Throw(NS_ERROR_INVALID_ARG);
     return;
   }
 
-  aRv = mProvider->StartTone(aDTMFChar);
+  aRv = mProvider->StartTone(serviceId, aDTMFChar);
 }
 
 void
-Telephony::StopTone(ErrorResult& aRv)
+Telephony::StopTone(const Optional<uint32_t>& aServiceId, ErrorResult& aRv)
 {
-  aRv = mProvider->StopTone();
+  uint32_t serviceId = ProvidedOrDefaultServiceId(aServiceId);
+
+  if (!IsValidServiceId(serviceId)) {
+    aRv.Throw(NS_ERROR_INVALID_ARG);
+    return;
+  }
+
+  aRv = mProvider->StopTone(serviceId);
 }
 
 bool
@@ -467,16 +507,16 @@ Telephony::EventListenerAdded(nsIAtom* aType)
 // nsITelephonyListener
 
 NS_IMETHODIMP
-Telephony::CallStateChanged(uint32_t aCallIndex, uint16_t aCallState,
+Telephony::CallStateChanged(uint32_t aServiceId, uint32_t aCallIndex,
-                            const nsAString& aNumber, bool aIsActive,
+                            uint16_t aCallState, const nsAString& aNumber,
-                            bool aIsOutgoing, bool aIsEmergency,
+                            bool aIsActive, bool aIsOutgoing, bool aIsEmergency,
                             bool aIsConference)
 {
   NS_ASSERTION(aCallIndex != kOutgoingPlaceholderCallIndex,
                "This should never happen!");
 
   nsRefPtr<TelephonyCall> modifiedCall
-      = GetCallFromEverywhere(aCallIndex);
+      = GetCallFromEverywhere(aServiceId, aCallIndex);
 
   // Try to use the outgoing call if we don't find the modified call.
   if (!modifiedCall) {
@@ -532,7 +572,7 @@ Telephony::CallStateChanged(uint32_t aCallIndex, uint16_t aCallState,
 
   // Didn't find this call in mCalls or mGroup. Create a new call.
   nsRefPtr<TelephonyCall> call =
-      TelephonyCall::Create(this, aNumber, aCallState, aCallIndex,
+      TelephonyCall::Create(this, aServiceId, aNumber, aCallState, aCallIndex,
                             aIsEmergency, aIsConference);
   NS_ASSERTION(call, "This should never fail!");
 
@@ -569,9 +609,9 @@ Telephony::EnumerateCallStateComplete()
 }
 
 NS_IMETHODIMP
-Telephony::EnumerateCallState(uint32_t aCallIndex, uint16_t aCallState,
+Telephony::EnumerateCallState(uint32_t aServiceId, uint32_t aCallIndex,
-                              const nsAString& aNumber, bool aIsActive,
+                              uint16_t aCallState, const nsAString& aNumber,
-                              bool aIsOutgoing, bool aIsEmergency,
+                              bool aIsActive, bool aIsOutgoing, bool aIsEmergency,
                               bool aIsConference)
 {
   nsRefPtr<TelephonyCall> call;
@@ -581,15 +621,14 @@ Telephony::EnumerateCallState(uint32_t aCallIndex, uint16_t aCallState,
   // However, it is likely to have call state changes, i.e. CallStateChanged()
   // being called, before the enumeration result comes back. We'd make sure
   // we don't somehow add duplicates due to the race condition.
-  call = GetCallFromEverywhere(aCallIndex);
+  call = GetCallFromEverywhere(aServiceId, aCallIndex);
   if (call) {
     return NS_OK;
   }
 
   // Didn't know anything about this call before now.
-
+  call = TelephonyCall::Create(this, aServiceId, aNumber, aCallState,
-  call = TelephonyCall::Create(this, aNumber, aCallState, aCallIndex,
+                               aCallIndex, aIsEmergency, aIsConference);
-                               aIsEmergency, aIsConference);
   NS_ASSERTION(call, "This should never fail!");
 
   NS_ASSERTION(aIsConference ? mGroup->CallsArray().Contains(call) :
@@ -600,12 +639,13 @@ Telephony::EnumerateCallState(uint32_t aCallIndex, uint16_t aCallState,
 }
 
 NS_IMETHODIMP
-Telephony::SupplementaryServiceNotification(int32_t aCallIndex,
+Telephony::SupplementaryServiceNotification(uint32_t aServiceId,
+                                            int32_t aCallIndex,
                                             uint16_t aNotification)
 {
   nsRefPtr<TelephonyCall> associatedCall;
   if (!mCalls.IsEmpty() && aCallIndex != -1) {
-    associatedCall = GetCall(aCallIndex);
+    associatedCall = GetCall(aServiceId, aCallIndex);
   }
 
   nsresult rv;
@@ -626,7 +666,8 @@ Telephony::SupplementaryServiceNotification(int32_t aCallIndex,
 }
 
 NS_IMETHODIMP
-Telephony::NotifyError(int32_t aCallIndex,
+Telephony::NotifyError(uint32_t aServiceId,
+                       int32_t aCallIndex,
                        const nsAString& aError)
 {
   if (mCalls.IsEmpty()) {
@@ -637,7 +678,7 @@ Telephony::NotifyError(int32_t aCallIndex,
   nsRefPtr<TelephonyCall> callToNotify;
 
   callToNotify = (aCallIndex == -1) ? GetOutgoingCall()
-                                    : GetCall(aCallIndex);
+                                    : GetCall(aServiceId, aCallIndex);
 
   if (!callToNotify) {
     NS_ERROR("Don't call me with a bad call index!");
@@ -653,9 +694,10 @@ Telephony::NotifyError(int32_t aCallIndex,
 }
 
 NS_IMETHODIMP
-Telephony::NotifyCdmaCallWaiting(const nsAString& aNumber)
+Telephony::NotifyCdmaCallWaiting(uint32_t aServiceId, const nsAString& aNumber)
 {
   MOZ_ASSERT(mActiveCall &&
+             mActiveCall->ServiceId() == aServiceId &&
              mActiveCall->CallState() == nsITelephonyProvider::CALL_STATE_CONNECTED);
 
   nsRefPtr<TelephonyCall> callToNotify = mActiveCall;

dom/telephony/Telephony.h

@@ -7,6 +7,7 @@
 #ifndef mozilla_dom_telephony_telephony_h__
 #define mozilla_dom_telephony_telephony_h__
 
+#include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/telephony/TelephonyCommon.h"
 
 #include "nsITelephonyProvider.h"
@@ -66,16 +67,19 @@ public:
 
   // WebIDL
   already_AddRefed<TelephonyCall>
-  Dial(const nsAString& aNumber, ErrorResult& aRv);
+  Dial(const nsAString& aNumber, const Optional<uint32_t>& aServiceId,
+       ErrorResult& aRv);
 
   already_AddRefed<TelephonyCall>
-  DialEmergency(const nsAString& aNumber, ErrorResult& aRv);
+  DialEmergency(const nsAString& aNumber, const Optional<uint32_t>& aServiceId,
+                ErrorResult& aRv);
 
   void
-  StartTone(const nsAString& aDTMF, ErrorResult& aRv);
+  StartTone(const nsAString& aDTMFChar, const Optional<uint32_t>& aServiceId,
+            ErrorResult& aRv);
 
   void
-  StopTone(ErrorResult& aRv);
+  StopTone(const Optional<uint32_t>& aServiceId, ErrorResult& aRv);
 
   bool
   GetMuted(ErrorResult& aRv) const;
@@ -148,9 +152,18 @@ private:
   static bool
   IsValidNumber(const nsAString& aNumber);
 
+  static uint32_t
+  GetNumServices();
+
+  static bool
+  IsValidServiceId(uint32_t aServiceId);
+
   static bool
   IsActiveState(uint16_t aCallState);
 
+  uint32_t
+  ProvidedOrDefaultServiceId(const Optional<uint32_t>& aServiceId);
+
   bool
   HasDialingCall();
 
@@ -158,15 +171,15 @@ private:
   MatchActiveCall(TelephonyCall* aCall);
 
   already_AddRefed<TelephonyCall>
-  DialInternal(bool isEmergency,
+  DialInternal(uint32_t aServiceId, const nsAString& aNumber,
-               const nsAString& aNumber,
+               bool isEmergency, ErrorResult& aRv);
-               ErrorResult& aRv);
 
   already_AddRefed<TelephonyCall>
-  CreateNewDialingCall(const nsAString& aNumber);
+  CreateNewDialingCall(uint32_t aServiceId, const nsAString& aNumber);
 
   void
-  NoteDialedCallFromOtherInstance(const nsAString& aNumber);
+  NoteDialedCallFromOtherInstance(uint32_t aServiceId,
+                                  const nsAString& aNumber);
 
   nsresult
   NotifyCallsChanged(TelephonyCall* aCall);
@@ -181,13 +194,13 @@ private:
   UpdateActiveCall(TelephonyCall* aCall, bool aIsActive);
 
   already_AddRefed<TelephonyCall>
-  GetCall(uint32_t aCallIndex);
+  GetCall(uint32_t aServiceId, uint32_t aCallIndex);
 
   already_AddRefed<TelephonyCall>
   GetOutgoingCall();
 
   already_AddRefed<TelephonyCall>
-  GetCallFromEverywhere(uint32_t aCallIndex);
+  GetCallFromEverywhere(uint32_t aServiceId, uint32_t aCallIndex);
 };
 
 } // namespace dom

dom/telephony/TelephonyCall.cpp

@@ -19,9 +19,9 @@ using mozilla::dom::telephony::kOutgoingPlaceholderCallIndex;
 
 // static
 already_AddRefed<TelephonyCall>
-TelephonyCall::Create(Telephony* aTelephony, const nsAString& aNumber,
+TelephonyCall::Create(Telephony* aTelephony, uint32_t aServiceId,
-                      uint16_t aCallState, uint32_t aCallIndex,
+                      const nsAString& aNumber, uint16_t aCallState,
-                      bool aEmergency, bool aIsConference)
+                      uint32_t aCallIndex, bool aEmergency, bool aIsConference)
 {
   NS_ASSERTION(aTelephony, "Null pointer!");
   NS_ASSERTION(!aNumber.IsEmpty(), "Empty number!");
@@ -32,6 +32,7 @@ TelephonyCall::Create(Telephony* aTelephony, const nsAString& aNumber,
   call->BindToOwner(aTelephony->GetOwner());
 
   call->mTelephony = aTelephony;
+  call->mServiceId = aServiceId;
   call->mNumber = aNumber;
   call->mCallIndex = aCallIndex;
   call->mError = nullptr;
@@ -219,7 +220,7 @@ TelephonyCall::Answer(ErrorResult& aRv)
     return;
   }
 
-  nsresult rv = mTelephony->Provider()->AnswerCall(mCallIndex);
+  nsresult rv = mTelephony->Provider()->AnswerCall(mServiceId, mCallIndex);
   if (NS_FAILED(rv)) {
     aRv.Throw(rv);
     return;
@@ -238,8 +239,8 @@ TelephonyCall::HangUp(ErrorResult& aRv)
   }
 
   nsresult rv = mCallState == nsITelephonyProvider::CALL_STATE_INCOMING ?
-                mTelephony->Provider()->RejectCall(mCallIndex) :
+                mTelephony->Provider()->RejectCall(mServiceId, mCallIndex) :
-                mTelephony->Provider()->HangUp(mCallIndex);
+                mTelephony->Provider()->HangUp(mServiceId, mCallIndex);
   if (NS_FAILED(rv)) {
     aRv.Throw(rv);
     return;
@@ -261,7 +262,7 @@ TelephonyCall::Hold(ErrorResult& aRv)
     return;
   }
 
-  nsresult rv = mTelephony->Provider()->HoldCall(mCallIndex);
+  nsresult rv = mTelephony->Provider()->HoldCall(mServiceId, mCallIndex);
   if (NS_FAILED(rv)) {
     aRv.Throw(rv);
     return;
@@ -290,7 +291,7 @@ TelephonyCall::Resume(ErrorResult& aRv)
     return;
   }
 
-  nsresult rv = mTelephony->Provider()->ResumeCall(mCallIndex);
+  nsresult rv = mTelephony->Provider()->ResumeCall(mServiceId, mCallIndex);
   if (NS_FAILED(rv)) {
     aRv.Throw(rv);
     return;

dom/telephony/TelephonyCall.h

@@ -21,6 +21,7 @@ class TelephonyCall MOZ_FINAL : public nsDOMEventTargetHelper
   nsRefPtr<Telephony> mTelephony;
   nsRefPtr<TelephonyCallGroup> mGroup;
 
+  uint32_t mServiceId;
   nsString mNumber;
   nsString mSecondNumber;
   nsString mState;
@@ -107,7 +108,8 @@ public:
   IMPL_EVENT_HANDLER(groupchange)
 
   static already_AddRefed<TelephonyCall>
-  Create(Telephony* aTelephony, const nsAString& aNumber, uint16_t aCallState,
+  Create(Telephony* aTelephony, uint32_t aServiceId,
+         const nsAString& aNumber, uint16_t aCallState,
          uint32_t aCallIndex = telephony::kOutgoingPlaceholderCallIndex,
          bool aEmergency = false, bool aIsConference = false);
 
@@ -117,6 +119,12 @@ public:
     ChangeStateInternal(aCallState, true);
   }
 
+  uint32_t
+  ServiceId() const
+  {
+    return mServiceId;
+  }
+
   uint32_t
   CallIndex() const
   {

dom/telephony/TelephonyCallGroup.cpp

@@ -146,6 +146,10 @@ TelephonyCallGroup::CanConference(const TelephonyCall& aCall,
 
   MOZ_ASSERT(mCallState == nsITelephonyProvider::CALL_STATE_UNKNOWN);
 
+  if (aCall.ServiceId() != aSecondCall->ServiceId()) {
+    return false;
+  }
+
   return (aCall.CallState() == nsITelephonyProvider::CALL_STATE_CONNECTED &&
           aSecondCall->CallState() == nsITelephonyProvider::CALL_STATE_HELD) ||
          (aCall.CallState() == nsITelephonyProvider::CALL_STATE_HELD &&
@@ -153,13 +157,14 @@ TelephonyCallGroup::CanConference(const TelephonyCall& aCall,
 }
 
 already_AddRefed<TelephonyCall>
-TelephonyCallGroup::GetCall(uint32_t aCallIndex)
+TelephonyCallGroup::GetCall(uint32_t aServiceId, uint32_t aCallIndex)
 {
   nsRefPtr<TelephonyCall> call;
 
   for (uint32_t index = 0; index < mCalls.Length(); index++) {
     nsRefPtr<TelephonyCall>& tempCall = mCalls[index];
-    if (tempCall->CallIndex() == aCallIndex) {
+    if (tempCall->ServiceId() == aServiceId &&
+        tempCall->CallIndex() == aCallIndex) {
       call = tempCall;
       break;
     }
@@ -207,7 +212,7 @@ TelephonyCallGroup::Add(TelephonyCall& aCall,
     return;
   }
 
-  aRv = mTelephony->Provider()->ConferenceCall();
+  aRv = mTelephony->Provider()->ConferenceCall(aCall.ServiceId());
 }
 
 void
@@ -220,7 +225,7 @@ TelephonyCallGroup::Add(TelephonyCall& aCall,
     return;
   }
 
-  aRv = mTelephony->Provider()->ConferenceCall();
+  aRv = mTelephony->Provider()->ConferenceCall(aCall.ServiceId());
 }
 
 void
@@ -231,18 +236,14 @@ TelephonyCallGroup::Remove(TelephonyCall& aCall, ErrorResult& aRv)
     return;
   }
 
+  uint32_t serviceId = aCall.ServiceId();
   uint32_t callIndex = aCall.CallIndex();
-  bool hasCallToRemove = false;
-  for (uint32_t index = 0; index < mCalls.Length(); index++) {
-    nsRefPtr<TelephonyCall>& call = mCalls[index];
-    if (call->CallIndex() == callIndex) {
-      hasCallToRemove = true;
-      break;
-    }
-  }
 
-  if (hasCallToRemove) {
+  nsRefPtr<TelephonyCall> call;
-    aRv = mTelephony->Provider()->SeparateCall(callIndex);
+
+  call = GetCall(serviceId, callIndex);
+  if (call) {
+    aRv = mTelephony->Provider()->SeparateCall(serviceId, callIndex);
   } else {
     NS_WARNING("Didn't have this call. Ignore!");
   }
@@ -256,7 +257,9 @@ TelephonyCallGroup::Hold(ErrorResult& aRv)
     return;
   }
 
-  nsresult rv = mTelephony->Provider()->HoldConference();
+  MOZ_ASSERT(!mCalls.IsEmpty());
+
+  nsresult rv = mTelephony->Provider()->HoldConference(mCalls[0]->ServiceId());
   if (NS_FAILED(rv)) {
     aRv.Throw(rv);
     return;
@@ -273,7 +276,9 @@ TelephonyCallGroup::Resume(ErrorResult& aRv)
     return;
   }
 
-  nsresult rv = mTelephony->Provider()->ResumeConference();
+  MOZ_ASSERT(!mCalls.IsEmpty());
+
+  nsresult rv = mTelephony->Provider()->ResumeConference(mCalls[0]->ServiceId());
   if (NS_FAILED(rv)) {
     aRv.Throw(rv);
     return;

dom/telephony/TelephonyCallGroup.h

@@ -81,7 +81,7 @@ public:
   RemoveCall(TelephonyCall* aCall);
 
   already_AddRefed<TelephonyCall>
-  GetCall(uint32_t aCallIndex);
+  GetCall(uint32_t aServiceId, uint32_t aCallIndex);
 
   const nsTArray<nsRefPtr<TelephonyCall> >&
   CallsArray() const