author | Hsin-Yi Tsai <htsai@mozilla.com> |
Tue, 06 Aug 2013 20:07:40 +0800 | |
changeset 141877 | 3af6bb32ac84aadd0403e91ee50c12ff5d7db425 |
parent 141876 | 5726180e4834d83a9eed9f4d3bd6bcfccfe8a281 |
child 141878 | a50e396cb60adad6b6b5bf1a52d21071d2271b9d |
push id | 25075 |
push user | ryanvm@gmail.com |
push date | Fri, 09 Aug 2013 21:26:24 +0000 |
treeherder | autoland@9bac3ba885eb [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | sicking, bent |
bugs | 822210 |
milestone | 26.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
dom/telephony/nsITelephonyProvider.idl | file | annotate | diff | comparison | revisions | |
dom/webidl/TelephonyCall.webidl | file | annotate | diff | comparison | revisions |
--- a/dom/telephony/nsITelephonyProvider.idl +++ b/dom/telephony/nsITelephonyProvider.idl @@ -1,15 +1,15 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nsISupports.idl" -[scriptable, uuid(a1e9fdd9-7901-4a0f-8b6b-6ee0fa8f9d81)] +[scriptable, uuid(3fb573c3-6fc4-41d3-80c1-f0e60662691e)] interface nsITelephonyListener : nsISupports { /** * Notified when a telephony call changes state. * * @param callIndex * Call identifier assigned by the RIL. * @param callState @@ -77,16 +77,24 @@ interface nsITelephonyListener : nsISupp * * @param callIndex * Call identifier assigned by the RIL. -1 if no connection * @param error * Error from RIL. */ void notifyError(in long callIndex, in AString error); + + /** + * Called when a waiting call comes in CDMA networks. + * + * @param number + * Number of the other party. + */ + void notifyCdmaCallWaiting(in AString number); }; /** * XPCOM component (in the content process) that provides the telephony * information. */ [scriptable, uuid(eddb7ff6-29af-4973-83de-1159365c7d7d)] interface nsITelephonyProvider : nsISupports
--- a/dom/webidl/TelephonyCall.webidl +++ b/dom/webidl/TelephonyCall.webidl @@ -2,16 +2,20 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ interface TelephonyCall : EventTarget { readonly attribute DOMString number; + // In CDMA networks, the 2nd waiting call shares the connection with the 1st + // call. We need an additional attribute for the 2nd number. + readonly attribute DOMString? secondNumber; + readonly attribute DOMString state; // The property "emergency" indicates whether the call number is an emergency // number. Only the outgoing call could have a value with true and it is // available after dialing state. readonly attribute boolean emergency; readonly attribute DOMError? error;