mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge m-c and inbound.

This commit is contained in:
Ryan VanderMeulen 2013-06-25 17:03:44 -04:00
Родитель 7c14d8cf98 d13c9361a4
Коммит 84b1954c49
3 изменённых файлов: 57 добавлений и 22 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
b2g/config/gaia.json
Просмотреть файл

@ -1,4 +1,4 @@
{
"revision": "a0809fcd4886fc33ec5cd4f2906ad37a5814f744",
"revision": "d47d5ef7db4e97d7de6c1e6a9a8874ec76c2eb9f",
"repo_path": "/integration/gaia-central"
}

23
dom/mobilemessage/src/ril/MmsService.js
Просмотреть файл

@ -183,9 +183,6 @@ XPCOMUtils.defineLazyGetter(this, "gMmsConnection", function () {
try {
this.mmsc = Services.prefs.getCharPref("ril.mms.mmsc");
if (this.mmsc.endsWith("/")) {
this.mmsc = this.mmsc.substr(0, this.mmsc.length - 1);
}
this.proxy = Services.prefs.getCharPref("ril.mms.mmsproxy");
this.port = Services.prefs.getIntPref("ril.mms.mmsport");
this.updateProxyInfo();
@ -345,9 +342,6 @@ XPCOMUtils.defineLazyGetter(this, "gMmsConnection", function () {
switch (data) {
case "ril.mms.mmsc":
this.mmsc = Services.prefs.getCharPref("ril.mms.mmsc");
if (this.mmsc.endsWith("/")) {
this.mmsc = this.mmsc.substr(0, this.mmsc.length - 1);
}
break;
case "ril.mms.mmsproxy":
this.proxy = Services.prefs.getCharPref("ril.mms.mmsproxy");
@ -380,7 +374,7 @@ XPCOMUtils.defineLazyGetter(this, "gMmsConnection", function () {
});
function MmsProxyFilter(url) {
this.url = url;
this.uri = Services.io.newURI(url, null, null);
}
MmsProxyFilter.prototype = {
@ -389,19 +383,14 @@ MmsProxyFilter.prototype = {
// nsIProtocolProxyFilter
applyFilter: function applyFilter(proxyService, uri, proxyInfo) {
let url = uri.prePath + uri.path;
if (url.endsWith("/")) {
url = url.substr(0, url.length - 1);
}
if (this.url != url) {
if (DEBUG) debug("applyFilter: content uri = " + this.url +
" is not matched url = " + url + " .");
if (!this.uri.equals(uri)) {
if (DEBUG) debug("applyFilter: content uri = " + JSON.stringify(this.uri) +
" is not matched with uri = " + JSON.stringify(uri) + " .");
return proxyInfo;
}
// Fall-through, reutrn the MMS proxy info.
if (DEBUG) debug("applyFilter: MMSC is matched: " +
JSON.stringify({ url: this.url,
if (DEBUG) debug("applyFilter: MMSC/Content Location is matched with: " +
JSON.stringify({ uri: JSON.stringify(this.uri),
proxyInfo: gMmsConnection.proxyInfo }));
return gMmsConnection.proxyInfo ? gMmsConnection.proxyInfo : proxyInfo;
}

54
dom/system/gonk/ril_consts.js
Просмотреть файл

@ -230,21 +230,67 @@ this.ERROR_SS_MODIFIED_TO_DIAL = 23;
this.ERROR_SS_MODIFIED_TO_USSD = 24;
this.ERROR_SS_MODIFIED_TO_SS = 25;
this.ERROR_SUBSCRIPTION_NOT_SUPPORTED = 26;
this.ERROR_INVALID_PARAMETER = 27;
this.ERROR_REJECTED_BY_REMOTE = 28;
this.GECKO_ERROR_SUCCESS = null;
this.GECKO_ERROR_RADIO_NOT_AVAILABLE = "RadioNotAvailable";
this.GECKO_ERROR_GENERIC_FAILURE = "GenericFailure";
this.GECKO_ERROR_REQUEST_NOT_SUPPORTED = "RequestNotSupported";
this.GECKO_ERROR_ILLEGAL_SIM_OR_ME = "IllegalSIMorME";
this.GECKO_ERROR_PASSWORD_INCORRECT = "IncorrectPassword";
this.GECKO_ERROR_SIM_PIN2 = "SimPin2";
this.GECKO_ERROR_SIM_PUK2 = "SimPuk2";
this.GECKO_ERROR_REQUEST_NOT_SUPPORTED = "RequestNotSupported";
this.GECKO_ERROR_CANCELLED = "Cancelled";
this.GECKO_ERROR_ILLEGAL_SIM_OR_ME = "IllegalSIMorME";
this.GECKO_ERROR_OP_NOT_ALLOWED_DURING_VOICE_CALL = "OpNotAllowedDuringVoiceCall";
this.GECKO_ERROR_OP_NOT_ALLOWED_BEFORE_REG_TO_NW = "OpNotAllowedBeforeRegToNw";
this.GECKO_ERROR_SMS_SEND_FAIL_RETRY = "SmsSendFailRetry";
this.GECKO_ERROR_SIM_ABSENT = "SimAbsent";
this.GECKO_ERROR_SUBSCRIPTION_NOT_AVAILABLE = "SubscriptionNotAvailable";
this.GECKO_ERROR_MODE_NOT_SUPPORTED = "ModeNotSupported";
this.GECKO_ERROR_FDN_CHECK_FAILURE = "FdnCheckFailure";
this.GECKO_ERROR_DIAL_MODIFIED_TO_USSD = "DialModifiedToUssd";
this.GECKO_ERROR_DIAL_MODIFIED_TO_SS = "DialModifiedToSs";
this.GECKO_ERROR_DIAL_MODIFIED_TO_DIAL = "DialModifiedToDial";
this.GECKO_ERROR_USSD_MODIFIED_TO_DIAL = "UssdModifiedToDial";
this.GECKO_ERROR_USSD_MODIFIED_TO_SS = "UssdModifiedToSs";
this.GECKO_ERROR_USSD_MODIFIED_TO_USSD = "UssdModifiedToUssd";
this.GECKO_ERROR_SS_MODIFIED_TO_DIAL = "SsModifiedToDial";
this.GECKO_ERROR_SS_MODIFIED_TO_USSD = "SsModifiedToUssd";
this.GECKO_ERROR_SS_MODIFIED_TO_SS = "SsModifiedToSs";
this.GECKO_ERROR_SUBSCRIPTION_NOT_SUPPORTED = "SubscriptionNotSupported";
this.GECKO_ERROR_INVALID_PARAMETER = "InvalidParameter";
this.GECKO_ERROR_REJECTED_BY_REMOTE = "RejectedByRemote";
this.RIL_ERROR_TO_GECKO_ERROR = {};
RIL_ERROR_TO_GECKO_ERROR[ERROR_SUCCESS] = GECKO_ERROR_SUCCESS;
RIL_ERROR_TO_GECKO_ERROR[ERROR_RADIO_NOT_AVAILABLE] = GECKO_ERROR_RADIO_NOT_AVAILABLE;
RIL_ERROR_TO_GECKO_ERROR[ERROR_GENERIC_FAILURE] = GECKO_ERROR_GENERIC_FAILURE;
RIL_ERROR_TO_GECKO_ERROR[ERROR_REQUEST_NOT_SUPPORTED] = GECKO_ERROR_REQUEST_NOT_SUPPORTED;
RIL_ERROR_TO_GECKO_ERROR[ERROR_ILLEGAL_SIM_OR_ME] = GECKO_ERROR_ILLEGAL_SIM_OR_ME;
RIL_ERROR_TO_GECKO_ERROR[ERROR_PASSWORD_INCORRECT] = GECKO_ERROR_PASSWORD_INCORRECT;
RIL_ERROR_TO_GECKO_ERROR[ERROR_SIM_PIN2] = GECKO_ERROR_SIM_PIN2;
RIL_ERROR_TO_GECKO_ERROR[ERROR_SIM_PUK2] = GECKO_ERROR_SIM_PUK2;
RIL_ERROR_TO_GECKO_ERROR[ERROR_REQUEST_NOT_SUPPORTED] = GECKO_ERROR_REQUEST_NOT_SUPPORTED;
RIL_ERROR_TO_GECKO_ERROR[ERROR_CANCELLED] = GECKO_ERROR_CANCELLED;
RIL_ERROR_TO_GECKO_ERROR[ERROR_OP_NOT_ALLOWED_DURING_VOICE_CALL] = GECKO_ERROR_OP_NOT_ALLOWED_DURING_VOICE_CALL;
RIL_ERROR_TO_GECKO_ERROR[ERROR_OP_NOT_ALLOWED_BEFORE_REG_TO_NW] = GECKO_ERROR_OP_NOT_ALLOWED_BEFORE_REG_TO_NW;
RIL_ERROR_TO_GECKO_ERROR[ERROR_SMS_SEND_FAIL_RETRY] = GECKO_ERROR_SMS_SEND_FAIL_RETRY;
RIL_ERROR_TO_GECKO_ERROR[ERROR_SIM_ABSENT] = GECKO_ERROR_SIM_ABSENT;
RIL_ERROR_TO_GECKO_ERROR[ERROR_SUBSCRIPTION_NOT_AVAILABLE] = GECKO_ERROR_SUBSCRIPTION_NOT_AVAILABLE;
RIL_ERROR_TO_GECKO_ERROR[ERROR_MODE_NOT_SUPPORTED] = GECKO_ERROR_MODE_NOT_SUPPORTED;
RIL_ERROR_TO_GECKO_ERROR[ERROR_FDN_CHECK_FAILURE] = GECKO_ERROR_FDN_CHECK_FAILURE;
RIL_ERROR_TO_GECKO_ERROR[ERROR_ILLEGAL_SIM_OR_ME] = GECKO_ERROR_ILLEGAL_SIM_OR_ME;
RIL_ERROR_TO_GECKO_ERROR[ERROR_DIAL_MODIFIED_TO_USSD] = GECKO_ERROR_DIAL_MODIFIED_TO_USSD;
RIL_ERROR_TO_GECKO_ERROR[ERROR_DIAL_MODIFIED_TO_SS] = GECKO_ERROR_DIAL_MODIFIED_TO_SS;
RIL_ERROR_TO_GECKO_ERROR[ERROR_DIAL_MODIFIED_TO_DIAL] = GECKO_ERROR_DIAL_MODIFIED_TO_DIAL;
RIL_ERROR_TO_GECKO_ERROR[ERROR_USSD_MODIFIED_TO_DIAL] = GECKO_ERROR_USSD_MODIFIED_TO_DIAL;
RIL_ERROR_TO_GECKO_ERROR[ERROR_USSD_MODIFIED_TO_SS] = GECKO_ERROR_USSD_MODIFIED_TO_SS;
RIL_ERROR_TO_GECKO_ERROR[ERROR_USSD_MODIFIED_TO_USSD] = GECKO_ERROR_USSD_MODIFIED_TO_USSD;
RIL_ERROR_TO_GECKO_ERROR[ERROR_SS_MODIFIED_TO_DIAL] = GECKO_ERROR_SS_MODIFIED_TO_DIAL;
RIL_ERROR_TO_GECKO_ERROR[ERROR_SS_MODIFIED_TO_USSD] = GECKO_ERROR_SS_MODIFIED_TO_USSD;
RIL_ERROR_TO_GECKO_ERROR[ERROR_SS_MODIFIED_TO_SS] = GECKO_ERROR_SS_MODIFIED_TO_SS;
RIL_ERROR_TO_GECKO_ERROR[ERROR_SUBSCRIPTION_NOT_SUPPORTED] = GECKO_ERROR_SUBSCRIPTION_NOT_SUPPORTED;
RIL_ERROR_TO_GECKO_ERROR[ERROR_INVALID_PARAMETER] = GECKO_ERROR_INVALID_PARAMETER;
RIL_ERROR_TO_GECKO_ERROR[ERROR_REJECTED_BY_REMOTE] = GECKO_ERROR_REJECTED_BY_REMOTE;
// 3GPP 23.040 clause 9.2.3.6 TP-Message-Reference(TP-MR):
// The number of times the MS automatically repeats the SMS-SUBMIT shall be in