Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-21 17:59:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 913436 - Gecko needs to return a proper error code when sending messages to non-FDN receivers. r=vicamo a=koi+

Browse Source
This commit is contained in:
Gene Lian 2013-09-09 21:48:07 +08:00
parent a43f7058fb
commit 0f3da7edee
5 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom/mobilemessage/interfaces/nsIMobileMessageCallback.idl
View File

@ -14,7 +14,7 @@ dictionary SmsThreadListItem
unsigned long long unreadCount;
};
[scriptable, uuid(399125a8-00d2-11e3-8d12-3fba4465c097)]
[scriptable, uuid(5f82f826-1956-11e3-a2bb-9b043b33de27)]
interface nsIMobileMessageCallback : nsISupports
{
/**
@ -30,6 +30,7 @@ interface nsIMobileMessageCallback : nsISupports
const unsigned short NO_SIM_CARD_ERROR = 5;
const unsigned short RADIO_DISABLED_ERROR = 6;
const unsigned short INVALID_ADDRESS_ERROR = 7;
const unsigned short FDN_CHECK_ERROR = 8;
/**
* |message| can be nsIDOMMoz{Mms,Sms}Message.

3
dom/mobilemessage/src/MobileMessageCallback.cpp
View File

@ -104,6 +104,9 @@ MobileMessageCallback::NotifyError(int32_t aError, bool aAsync)
case nsIMobileMessageCallback::INVALID_ADDRESS_ERROR:
errorStr = NS_LITERAL_STRING("InvalidAddressError");
break;
case nsIMobileMessageCallback::FDN_CHECK_ERROR:
errorStr = NS_LITERAL_STRING("FdnCheckError");
break;
default: // SUCCESS_NO_ERROR is handled above.
MOZ_CRASH("Should never get here!");
}

3
dom/system/gonk/RadioInterfaceLayer.js
View File

@ -2676,6 +2676,9 @@ RadioInterface.prototype = {
case RIL.ERROR_RADIO_NOT_AVAILABLE:
error = Ci.nsIMobileMessageCallback.NO_SIGNAL_ERROR;
break;
case RIL.ERROR_FDN_CHECK_FAILURE:
error = Ci.nsIMobileMessageCallback.FDN_CHECK_ERROR;
break;
}
if (context.silent) {

1
embedding/android/GeckoSmsManager.java
View File

@ -309,6 +309,7 @@ public class GeckoSmsManager
public final static int kNoSimCardError = 5;
public final static int kRadioDisabledError = 6;
public final static int kInvalidAddressError = 7;
public final static int kFdnCheckError = 8;
private final static int kMaxMessageSize = 160;

2
mobile/android/base/GeckoSmsManager.java
View File

@ -303,7 +303,7 @@ public class GeckoSmsManager
public final static int kNoSimCardError = 5;
public final static int kRadioDisabledError = 6;
public final static int kInvalidAddressError = 7;
public final static int kFdnCheckError = 8;
private final static int kMaxMessageSize = 160;