From 2c02688cc7f3175ded3bb3c3078b99d5885f89e2 Mon Sep 17 00:00:00 2001
From: "Szu-Yu Chen [:aknow]" <szchen@mozilla.com>
Date: Tue, 23 Dec 2014 15:46:09 +0800
Subject: [PATCH] Bug 1113027 - Part 2: Should pass clientId to
 notifyDialCallSuccess (dom). r=hsinyi

---
 dom/telephony/Telephony.cpp             |  2 +-
 dom/telephony/TelephonyDialCallback.cpp | 11 +++++------
 dom/telephony/TelephonyDialCallback.h   |  3 +--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/dom/telephony/Telephony.cpp b/dom/telephony/Telephony.cpp
index 8d05798c4b8c..0052fa0357ae 100644
--- a/dom/telephony/Telephony.cpp
+++ b/dom/telephony/Telephony.cpp
@@ -224,7 +224,7 @@ Telephony::DialInternal(uint32_t aServiceId, const nsAString& aNumber,
   }
 
   nsCOMPtr<nsITelephonyDialCallback> callback =
-    new TelephonyDialCallback(GetOwner(), this, promise, aServiceId);
+    new TelephonyDialCallback(GetOwner(), this, promise);
 
   nsresult rv = mService->Dial(aServiceId, aNumber, aEmergency, callback);
   if (NS_FAILED(rv)) {
diff --git a/dom/telephony/TelephonyDialCallback.cpp b/dom/telephony/TelephonyDialCallback.cpp
index 6968d8ec4ad2..915d65d46145 100644
--- a/dom/telephony/TelephonyDialCallback.cpp
+++ b/dom/telephony/TelephonyDialCallback.cpp
@@ -16,10 +16,8 @@ NS_IMPL_ISUPPORTS_INHERITED(TelephonyDialCallback, TelephonyCallback,
 
 TelephonyDialCallback::TelephonyDialCallback(nsPIDOMWindow* aWindow,
                                              Telephony* aTelephony,
-                                             Promise* aPromise,
-                                             uint32_t aServiceId)
-  : TelephonyCallback(aPromise), mWindow(aWindow), mTelephony(aTelephony),
-    mServiceId(aServiceId)
+                                             Promise* aPromise)
+  : TelephonyCallback(aPromise), mWindow(aWindow), mTelephony(aTelephony)
 {
   MOZ_ASSERT(mTelephony);
 }
@@ -52,12 +50,13 @@ TelephonyDialCallback::NotifyDialMMI(const nsAString& aServiceCode)
 }
 
 NS_IMETHODIMP
-TelephonyDialCallback::NotifyDialCallSuccess(uint32_t aCallIndex,
+TelephonyDialCallback::NotifyDialCallSuccess(uint32_t aClientId,
+                                             uint32_t aCallIndex,
                                              const nsAString& aNumber)
 {
   nsRefPtr<TelephonyCallId> id = mTelephony->CreateCallId(aNumber);
   nsRefPtr<TelephonyCall> call =
-      mTelephony->CreateCall(id, mServiceId, aCallIndex,
+      mTelephony->CreateCall(id, aClientId, aCallIndex,
                              nsITelephonyService::CALL_STATE_DIALING);
 
   mPromise->MaybeResolve(call);
diff --git a/dom/telephony/TelephonyDialCallback.h b/dom/telephony/TelephonyDialCallback.h
index 20e6d3243a5c..eb507120b36f 100644
--- a/dom/telephony/TelephonyDialCallback.h
+++ b/dom/telephony/TelephonyDialCallback.h
@@ -31,7 +31,7 @@ public:
   NS_DECL_NSITELEPHONYDIALCALLBACK
 
   TelephonyDialCallback(nsPIDOMWindow* aWindow, Telephony* aTelephony,
-                        Promise* aPromise, uint32_t aServiceId);
+                        Promise* aPromise);
 
   NS_FORWARD_NSITELEPHONYCALLBACK(TelephonyCallback::)
 
@@ -44,7 +44,6 @@ private:
 
   nsCOMPtr<nsPIDOMWindow> mWindow;
   nsRefPtr<Telephony> mTelephony;
-  uint32_t mServiceId;
 
   nsString mServiceCode;
   nsRefPtr<MMICall> mMMICall;