Bug 1113027 - Part 3: Should pass clientId to notifyDialCallSuccess (ipc). r=hsinyi
authorSzu-Yu Chen [:aknow] <szchen@mozilla.com>
Tue, 23 Dec 2014 15:46:10 +0800
changeset 221124 1a3e4051c9e84a87d1f7b58a0347218494e95d11
parent 221123 695faad3c4db2c8fba4778f00fa60dae59b64501
child 221125 3ddec385426eee8a6e3a67c5e535644de4b89880
push id28011
push userkwierso@gmail.com
push dateWed, 24 Dec 2014 00:36:52 +0000
treeherdermozilla-central@865d06511e99 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershsinyi
bugs1113027
milestone37.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1113027 - Part 3: Should pass clientId to notifyDialCallSuccess (ipc). r=hsinyi
dom/telephony/ipc/PTelephonyRequest.ipdl
dom/telephony/ipc/TelephonyChild.cpp
dom/telephony/ipc/TelephonyParent.cpp
--- a/dom/telephony/ipc/PTelephonyRequest.ipdl
+++ b/dom/telephony/ipc/PTelephonyRequest.ipdl
@@ -23,16 +23,17 @@ struct SuccessResponse
 
 struct ErrorResponse
 {
   nsString name;
 };
 
 struct DialResponseCallSuccess
 {
+  uint32_t clientId;
   uint32_t callIndex;
   nsString number;
 };
 
 struct DialResponseMMISuccess
 {
   nsString statusMessage;
   AdditionalInformation additionalInformation;
--- a/dom/telephony/ipc/TelephonyChild.cpp
+++ b/dom/telephony/ipc/TelephonyChild.cpp
@@ -210,17 +210,18 @@ TelephonyRequestChild::DoResponse(const 
   return true;
 }
 
 bool
 TelephonyRequestChild::DoResponse(const DialResponseCallSuccess& aResponse)
 {
   MOZ_ASSERT(mCallback);
   nsCOMPtr<nsITelephonyDialCallback> callback = do_QueryInterface(mCallback);
-  callback->NotifyDialCallSuccess(aResponse.callIndex(), aResponse.number());
+  callback->NotifyDialCallSuccess(aResponse.clientId(), aResponse.callIndex(),
+                                  aResponse.number());
   return true;
 }
 
 bool
 TelephonyRequestChild::DoResponse(const DialResponseMMISuccess& aResponse)
 {
   MOZ_ASSERT(mCallback);
   nsCOMPtr<nsITelephonyDialCallback> callback = do_QueryInterface(mCallback);
--- a/dom/telephony/ipc/TelephonyParent.cpp
+++ b/dom/telephony/ipc/TelephonyParent.cpp
@@ -583,20 +583,22 @@ TelephonyRequestParent::NotifySuccess()
 
 NS_IMETHODIMP
 TelephonyRequestParent::NotifyError(const nsAString& aError)
 {
   return SendResponse(ErrorResponse(nsAutoString(aError)));
 }
 
 NS_IMETHODIMP
-TelephonyRequestParent::NotifyDialCallSuccess(uint32_t aCallIndex,
+TelephonyRequestParent::NotifyDialCallSuccess(uint32_t aClientId,
+                                              uint32_t aCallIndex,
                                               const nsAString& aNumber)
 {
-  return SendResponse(DialResponseCallSuccess(aCallIndex, nsAutoString(aNumber)));
+  return SendResponse(DialResponseCallSuccess(aClientId, aCallIndex,
+                                              nsAutoString(aNumber)));
 }
 
 NS_IMETHODIMP
 TelephonyRequestParent::NotifyDialMMISuccess(const nsAString& aStatusMessage)
 {
   return SendResponse(DialResponseMMISuccess(nsAutoString(aStatusMessage),
                                              AdditionalInformation(mozilla::void_t())));
 }