Bug 1113027 - Part 2: Should pass clientId to notifyDialCallSuccess (dom). r=hsinyi

This commit is contained in:
Szu-Yu Chen [:aknow] 2014-12-23 15:46:09 +08:00
Родитель 86a4706cb8
Коммит 2c02688cc7
3 изменённых файлов: 7 добавлений и 9 удалений

Просмотреть файл

@ -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)) {

Просмотреть файл

@ -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);

Просмотреть файл

@ -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;