author | Hsin-Yi Tsai <htsai@mozilla.com> |
Tue, 30 Jul 2013 17:27:23 +0800 | |
changeset 141880 | 73f6186de86926730f3418d534be6c233c47d85f |
parent 141879 | fef9f66d8ae911939c7ce54aafd24bd5201b5bd5 |
child 141881 | c2bcf2317a095e58dce3ee3a201d9717748f4c62 |
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 | gyeh |
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
|
--- a/dom/bluetooth/BluetoothTelephonyListener.cpp +++ b/dom/bluetooth/BluetoothTelephonyListener.cpp @@ -87,16 +87,22 @@ TelephonyListener::NotifyError(int32_t a aError, EmptyString(), false, true); NS_WARNING("Reset the call state due to call transition ends abnormally"); } NS_WARNING(NS_ConvertUTF16toUTF8(aError).get()); return NS_OK; } +NS_IMETHODIMP +TelephonyListener::NotifyCdmaCallWaiting(const nsAString& aNumber) +{ + return NS_OK; +} + } // anonymous namespace BluetoothTelephonyListener::BluetoothTelephonyListener() { mTelephonyListener = new TelephonyListener(); } bool