From 3c4bb3761c0a5f53538749ee10a415f50120d369 Mon Sep 17 00:00:00 2001
From: "Szu-Yu Chen [:aknow]" <szchen@mozilla.com>
Date: Wed, 15 Jan 2014 09:41:50 -0500
Subject: [PATCH] Bug 952783 - Use first call instead of active call. r=hsinyi

---
 dom/telephony/Telephony.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dom/telephony/Telephony.cpp b/dom/telephony/Telephony.cpp
index 0de1b3eb6518..cbde08f20aff 100644
--- a/dom/telephony/Telephony.cpp
+++ b/dom/telephony/Telephony.cpp
@@ -697,11 +697,11 @@ Telephony::NotifyError(uint32_t aServiceId,
 NS_IMETHODIMP
 Telephony::NotifyCdmaCallWaiting(uint32_t aServiceId, const nsAString& aNumber)
 {
-  MOZ_ASSERT(mActiveCall &&
-             mActiveCall->ServiceId() == aServiceId &&
-             mActiveCall->CallState() == nsITelephonyProvider::CALL_STATE_CONNECTED);
+  MOZ_ASSERT(mCalls.Length() == 1);
+
+  nsRefPtr<TelephonyCall> callToNotify = mCalls[0];
+  MOZ_ASSERT(callToNotify && callToNotify->ServiceId() == aServiceId);
 
-  nsRefPtr<TelephonyCall> callToNotify = mActiveCall;
   callToNotify->UpdateSecondNumber(aNumber);
   DispatchCallEvent(NS_LITERAL_STRING("callschanged"), callToNotify);
   return NS_OK;