Bug 881174 - part3 - cdma 3way call internal idl. r=vicamo

This commit is contained in:
Hsin-Yi Tsai 2014-02-21 17:51:07 +08:00
parent fc0d71b672
commit f95e4cfbcd
2 changed files with 22 additions and 8 deletions

View File

@ -10,7 +10,7 @@
"@mozilla.org/telephony/gonktelephonyprovider;1"
%}
[scriptable, uuid(2ff3dcbb-ae63-443e-9c5d-76811f2f9b42)]
[scriptable, uuid(5fdd720f-fbe8-46f5-b671-3bf3360013dd)]
interface nsIGonkTelephonyProvider : nsITelephonyProvider
{
void notifyCallDisconnected(in unsigned long clientId, in jsval call);
@ -20,7 +20,8 @@ interface nsIGonkTelephonyProvider : nsITelephonyProvider
void notifyCallRing();
void notifyCallStateChanged(in unsigned long clientId, in jsval call);
void notifyCallStateChanged(in unsigned long clientId, in jsval call,
[optional] in boolean skipStateConversion);
void notifyCdmaCallWaiting(in unsigned long clientId, in AString number);
@ -28,7 +29,4 @@ interface nsIGonkTelephonyProvider : nsITelephonyProvider
in AString notification);
void notifyConferenceCallStateChanged(in short state);
void notifyConferenceError(in AString errorName,
in AString errorMsg);
};

View File

@ -4,7 +4,7 @@
#include "nsISupports.idl"
[scriptable, uuid(6385282b-4413-4cd6-b60a-de43e0b5c307)]
[scriptable, uuid(c25d3993-6481-4e12-acee-55e32f6e1454)]
interface nsITelephonyListener : nsISupports
{
/**
@ -26,6 +26,12 @@ interface nsITelephonyListener : nsISupports
* Indicates whether this call is an emergency call.
* @param isConference
* Indicates whether this call is a conference call.
* @param isSwitchable
* Indicates whether this call can be switched between states of
* nsITelephonyProvider::CALL_STATE_CONNECTED and
* nsITelephonyProvider::CALL_STATE_HELD.
* @param isMergeable
* Indicates whether this call be be added into a conference.
*/
void callStateChanged(in unsigned long clientId,
in unsigned long callIndex,
@ -34,7 +40,9 @@ interface nsITelephonyListener : nsISupports
in boolean isActive,
in boolean isOutgoing,
in boolean isEmergency,
in boolean isConference);
in boolean isConference,
in boolean isSwitchable,
in boolean isMergeable);
/**
* Called when participants of a conference call have been updated, and the
@ -72,6 +80,12 @@ interface nsITelephonyListener : nsISupports
* Indicates whether this call is outgoing or incoming.
* @param isConference
* Indicates whether this call is a conference call.
* @param isSwitchable
* Indicates whether this call can be switched between states of
* nsITelephonyProvider::CALL_STATE_CONNECTED and
* nsITelephonyProvider::CALL_STATE_HELD.
* @param isMergeable
* Indicates whether this call be be added into a conference.
*/
void enumerateCallState(in unsigned long clientId,
in unsigned long callIndex,
@ -80,7 +94,9 @@ interface nsITelephonyListener : nsISupports
in boolean isActive,
in boolean isOutgoing,
in boolean isEmergency,
in boolean isConference);
in boolean isConference,
in boolean isSwitchable,
in boolean isMergeable);
/**
* Notify when RIL receives supplementary service notification.