Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-11 10:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1058305 - Part 3: use defined network types in nsIRadioInterface (other components). r=echen

Browse Source
This commit is contained in:
Jessica Jong 2014-11-25 09:44:35 +08:00
parent ed5335372f
commit 1216f8260f
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/mobilemessage/gonk/MmsService.js
View File

@ -305,7 +305,7 @@ MmsConnection.prototype = {
this.hostsToRoute = [];
this.networkInterface = null;
this.radioInterface.deactivateDataCallByType("mms");
this.radioInterface.deactivateDataCallByType(Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_MMS);
};
let promises =
@ -441,7 +441,7 @@ MmsConnection.prototype = {
// Bug 1059110: Ensure all the initialization are done before setup data call.
if (DEBUG) debug("acquire: buffer the MMS request and setup the MMS data call.");
this.radioInterface.setupDataCallByType("mms");
this.radioInterface.setupDataCallByType(Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_MMS);
return false;
}

7
dom/system/gonk/GonkGPSGeolocationProvider.cpp
View File

@ -345,7 +345,8 @@ GonkGPSGeolocationProvider::GetDataConnectionState()
}
int32_t state;
mRadioInterface->GetDataCallStateByType(NS_LITERAL_STRING("supl"), &state);
mRadioInterface->GetDataCallStateByType(
nsINetworkInterface::NETWORK_TYPE_MOBILE_SUPL, &state);
return state;
}
@ -436,7 +437,7 @@ GonkGPSGeolocationProvider::RequestDataConnection()
// We just get supl APN and make AGPS data connection state updated.
RequestSettingValue("ril.supl.apn");
} else {
mRadioInterface->SetupDataCallByType(NS_LITERAL_STRING("supl"));
mRadioInterface->SetupDataCallByType(nsINetworkInterface::NETWORK_TYPE_MOBILE_SUPL);
}
}
@ -449,7 +450,7 @@ GonkGPSGeolocationProvider::ReleaseDataConnection()
return;
}
mRadioInterface->DeactivateDataCallByType(NS_LITERAL_STRING("supl"));
mRadioInterface->DeactivateDataCallByType(nsINetworkInterface::NETWORK_TYPE_MOBILE_SUPL);
}
void

4
dom/system/gonk/NetworkManager.js
View File

@ -888,7 +888,7 @@ NetworkManager.prototype = {
let data = connection && connection.data;
if (data && data.state === "registered") {
this.dunRetryTimes = 0;
ril.setupDataCallByType("dun");
ril.setupDataCallByType(Ci.nsINetworkInterface.NETWORK_TYPE_DUN);
this.dunConnectTimer.cancel();
this.dunConnectTimer.
initWithCallback(this.onDunConnectTimerTimeout.bind(this),
@ -931,7 +931,7 @@ NetworkManager.prototype = {
if (dun && (dun.state == Ci.nsINetworkInterface.NETWORK_STATE_CONNECTED)) {
this.mRil.getRadioInterface(this._dataDefaultServiceId)
.deactivateDataCallByType("dun");
.deactivateDataCallByType(Ci.nsINetworkInterface.NETWORK_TYPE_DUN);
}
return;
}