| author | Edgar Chen <echen@mozilla.com> |
| Wed, 02 Jul 2014 17:14:08 +0800 | |
| changeset 203155 | 3468cd2bbf599071046376339e24b25ea37aab3e |
| parent 203154 | 196f37f1b35eac21aaf097dfc8b6ad9f8492ebc2 |
| child 203156 | c6896f655e86c8d7a18f5a669bf090de2b564894 |
| push id | 27423 |
| push user | ryanvm@gmail.com |
| push date | Wed, 03 Sep 2014 18:53:23 +0000 |
| treeherder | mozilla-central@117271830c4d [default view] [failures only] |
| perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
| reviewers | echou |
| bugs | 843452 |
| milestone | 35.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/BluetoothRilListener.cpp +++ b/dom/bluetooth/BluetoothRilListener.cpp @@ -108,22 +108,22 @@ MobileConnectionListener::NotifyUssdRece NS_IMETHODIMP MobileConnectionListener::NotifyDataError(const nsAString & message) { return NS_OK; } NS_IMETHODIMP -MobileConnectionListener::NotifyCFStateChange(bool success, - uint16_t action, - uint16_t reason, - const nsAString& number, - uint16_t timeSeconds, - uint16_t serviceClass) +MobileConnectionListener::NotifyCFStateChanged(bool success, + uint16_t action, + uint16_t reason, + const nsAString& number, + uint16_t timeSeconds, + uint16_t serviceClass) { return NS_OK; } NS_IMETHODIMP MobileConnectionListener::NotifyEmergencyCbModeChanged(bool active, uint32_t timeoutMs) { @@ -149,28 +149,46 @@ MobileConnectionListener::NotifyRadioSta } NS_IMETHODIMP MobileConnectionListener::NotifyClirModeChanged(uint32_t aMode) { return NS_OK; } +NS_IMETHODIMP +MobileConnectionListener::NotifyLastKnownNetworkChanged() +{ + return NS_OK; +} + +NS_IMETHODIMP +MobileConnectionListener::NotifyLastKnownHomeNetworkChanged() +{ + return NS_OK; +} + +NS_IMETHODIMP +MobileConnectionListener::NotifyNetworkSelectionModeChanged() +{ + return NS_OK; +} + bool MobileConnectionListener::Listen(bool aStart) { - nsCOMPtr<nsIMobileConnectionProvider> provider = - do_GetService(NS_RILCONTENTHELPER_CONTRACTID); - NS_ENSURE_TRUE(provider, false); + nsCOMPtr<nsIMobileConnectionService> service = + do_GetService(NS_MOBILE_CONNECTION_SERVICE_CONTRACTID); + NS_ENSURE_TRUE(service, false); nsresult rv; if (aStart) { - rv = provider->RegisterMobileConnectionMsg(mClientId, this); + rv = service->RegisterListener(mClientId, this); } else { - rv = provider->UnregisterMobileConnectionMsg(mClientId, this); + rv = service->UnregisterListener(mClientId, this); } return NS_SUCCEEDED(rv); } /** * TelephonyListener Implementation */ @@ -347,23 +365,23 @@ BluetoothRilListener::Listen(bool aStart } void BluetoothRilListener::SelectClient() { // Reset mClientId mClientId = mMobileConnListeners.Length(); - nsCOMPtr<nsIMobileConnectionProvider> connection = - do_GetService(NS_RILCONTENTHELPER_CONTRACTID); - NS_ENSURE_TRUE_VOID(connection); + nsCOMPtr<nsIMobileConnectionService> service = + do_GetService(NS_MOBILE_CONNECTION_SERVICE_CONTRACTID); + NS_ENSURE_TRUE_VOID(service); for (uint32_t i = 0; i < mMobileConnListeners.Length(); i++) { nsCOMPtr<nsIMobileConnectionInfo> voiceInfo; - connection->GetVoiceConnectionInfo(i, getter_AddRefs(voiceInfo)); + service->GetVoiceConnectionInfo(i, getter_AddRefs(voiceInfo)); if (!voiceInfo) { BT_WARNING("%s: Failed to get voice connection info", __FUNCTION__); continue; } nsString regState; voiceInfo->GetState(regState); if (regState.EqualsLiteral("registered")) {
--- a/dom/bluetooth/BluetoothRilListener.h +++ b/dom/bluetooth/BluetoothRilListener.h @@ -7,17 +7,17 @@ #ifndef mozilla_dom_bluetooth_bluetoothrillistener_h__ #define mozilla_dom_bluetooth_bluetoothrillistener_h__ #include "BluetoothCommon.h" #include "nsAutoPtr.h" #include "nsIIccProvider.h" -#include "nsIMobileConnectionProvider.h" +#include "nsIMobileConnectionService.h" #include "nsITelephonyService.h" BEGIN_BLUETOOTH_NAMESPACE class BluetoothRilListener; class IccListener : public nsIIccListener {
--- a/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp +++ b/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp @@ -14,17 +14,17 @@ #include "mozilla/dom/bluetooth/BluetoothTypes.h" #include "mozilla/Services.h" #include "mozilla/StaticPtr.h" #include "nsContentUtils.h" #include "nsIAudioManager.h" #include "nsIDOMIccInfo.h" #include "nsIIccProvider.h" #include "nsIMobileConnectionInfo.h" -#include "nsIMobileConnectionProvider.h" +#include "nsIMobileConnectionService.h" #include "nsIMobileNetworkInfo.h" #include "nsIObserverService.h" #include "nsISettingsService.h" #include "nsITelephonyService.h" #include "nsRadioInterfaceLayer.h" #include "nsServiceManagerUtils.h" #include "nsThreadUtils.h" @@ -607,18 +607,18 @@ BluetoothHfpManager::HandleVolumeChanged sBluetoothHfpInterface->VolumeControl(HFP_VOLUME_TYPE_SPEAKER, mCurrentVgs, new VolumeControlResultHandler()); } } void BluetoothHfpManager::HandleVoiceConnectionChanged(uint32_t aClientId) { - nsCOMPtr<nsIMobileConnectionProvider> connection = - do_GetService(NS_RILCONTENTHELPER_CONTRACTID); + nsCOMPtr<nsIMobileConnectionService> connection = + do_GetService(NS_MOBILE_CONNECTION_SERVICE_CONTRACTID); NS_ENSURE_TRUE_VOID(connection); nsCOMPtr<nsIMobileConnectionInfo> voiceInfo; connection->GetVoiceConnectionInfo(aClientId, getter_AddRefs(voiceInfo)); NS_ENSURE_TRUE_VOID(voiceInfo); nsString type; voiceInfo->GetType(type);
--- a/dom/bluetooth/bluez/BluetoothHfpManager.cpp +++ b/dom/bluetooth/bluez/BluetoothHfpManager.cpp @@ -23,17 +23,17 @@ #include "nsIObserverService.h" #include "nsISettingsService.h" #include "nsServiceManagerUtils.h" #ifdef MOZ_B2G_RIL #include "nsIDOMIccInfo.h" #include "nsIIccProvider.h" #include "nsIMobileConnectionInfo.h" -#include "nsIMobileConnectionProvider.h" +#include "nsIMobileConnectionService.h" #include "nsIMobileNetworkInfo.h" #include "nsITelephonyService.h" #include "nsRadioInterfaceLayer.h" #endif /** * BRSF bitmask of AG supported features. See 4.34.1 "Bluetooth Defined AT * Capabilities" in Bluetooth hands-free profile 1.6 @@ -601,18 +601,18 @@ BluetoothHfpManager::HandleVolumeChanged SendCommand(RESPONSE_VGS, mCurrentVgs); } } #ifdef MOZ_B2G_RIL void BluetoothHfpManager::HandleVoiceConnectionChanged(uint32_t aClientId) { - nsCOMPtr<nsIMobileConnectionProvider> connection = - do_GetService(NS_RILCONTENTHELPER_CONTRACTID); + nsCOMPtr<nsIMobileConnectionService> connection = + do_GetService(NS_MOBILE_CONNECTION_SERVICE_CONTRACTID); NS_ENSURE_TRUE_VOID(connection); nsCOMPtr<nsIMobileConnectionInfo> voiceInfo; connection->GetVoiceConnectionInfo(aClientId, getter_AddRefs(voiceInfo)); NS_ENSURE_TRUE_VOID(voiceInfo); nsString type; voiceInfo->GetType(type);
--- a/dom/bluetooth2/BluetoothRilListener.cpp +++ b/dom/bluetooth2/BluetoothRilListener.cpp @@ -108,22 +108,22 @@ MobileConnectionListener::NotifyUssdRece NS_IMETHODIMP MobileConnectionListener::NotifyDataError(const nsAString & message) { return NS_OK; } NS_IMETHODIMP -MobileConnectionListener::NotifyCFStateChange(bool success, - uint16_t action, - uint16_t reason, - const nsAString& number, - uint16_t timeSeconds, - uint16_t serviceClass) +MobileConnectionListener::NotifyCFStateChanged(bool success, + uint16_t action, + uint16_t reason, + const nsAString& number, + uint16_t timeSeconds, + uint16_t serviceClass) { return NS_OK; } NS_IMETHODIMP MobileConnectionListener::NotifyEmergencyCbModeChanged(bool active, uint32_t timeoutMs) { @@ -149,28 +149,46 @@ MobileConnectionListener::NotifyRadioSta } NS_IMETHODIMP MobileConnectionListener::NotifyClirModeChanged(uint32_t aMode) { return NS_OK; } +NS_IMETHODIMP +MobileConnectionListener::NotifyLastKnownNetworkChanged() +{ + return NS_OK; +} + +NS_IMETHODIMP +MobileConnectionListener::NotifyLastKnownHomeNetworkChanged() +{ + return NS_OK; +} + +NS_IMETHODIMP +MobileConnectionListener::NotifyNetworkSelectionModeChanged() +{ + return NS_OK; +} + bool MobileConnectionListener::Listen(bool aStart) { - nsCOMPtr<nsIMobileConnectionProvider> provider = - do_GetService(NS_RILCONTENTHELPER_CONTRACTID); - NS_ENSURE_TRUE(provider, false); + nsCOMPtr<nsIMobileConnectionService> service = + do_GetService(NS_MOBILE_CONNECTION_SERVICE_CONTRACTID); + NS_ENSURE_TRUE(service, false); nsresult rv; if (aStart) { - rv = provider->RegisterMobileConnectionMsg(mClientId, this); + rv = service->RegisterListener(mClientId, this); } else { - rv = provider->UnregisterMobileConnectionMsg(mClientId, this); + rv = service->UnregisterListener(mClientId, this); } return NS_SUCCEEDED(rv); } /** * TelephonyListener Implementation */ @@ -347,23 +365,23 @@ BluetoothRilListener::Listen(bool aStart } void BluetoothRilListener::SelectClient() { // Reset mClientId mClientId = mMobileConnListeners.Length(); - nsCOMPtr<nsIMobileConnectionProvider> connection = - do_GetService(NS_RILCONTENTHELPER_CONTRACTID); - NS_ENSURE_TRUE_VOID(connection); + nsCOMPtr<nsIMobileConnectionService> service = + do_GetService(NS_MOBILE_CONNECTION_SERVICE_CONTRACTID); + NS_ENSURE_TRUE_VOID(service); for (uint32_t i = 0; i < mMobileConnListeners.Length(); i++) { nsCOMPtr<nsIMobileConnectionInfo> voiceInfo; - connection->GetVoiceConnectionInfo(i, getter_AddRefs(voiceInfo)); + service->GetVoiceConnectionInfo(i, getter_AddRefs(voiceInfo)); if (!voiceInfo) { BT_WARNING("%s: Failed to get voice connection info", __FUNCTION__); continue; } nsString regState; voiceInfo->GetState(regState); if (regState.EqualsLiteral("registered")) {
--- a/dom/bluetooth2/BluetoothRilListener.h +++ b/dom/bluetooth2/BluetoothRilListener.h @@ -7,17 +7,17 @@ #ifndef mozilla_dom_bluetooth_bluetoothrillistener_h__ #define mozilla_dom_bluetooth_bluetoothrillistener_h__ #include "BluetoothCommon.h" #include "nsAutoPtr.h" #include "nsIIccProvider.h" -#include "nsIMobileConnectionProvider.h" +#include "nsIMobileConnectionService.h" #include "nsITelephonyService.h" BEGIN_BLUETOOTH_NAMESPACE class BluetoothRilListener; class IccListener : public nsIIccListener {
--- a/dom/bluetooth2/bluedroid/hfp/BluetoothHfpManager.cpp +++ b/dom/bluetooth2/bluedroid/hfp/BluetoothHfpManager.cpp @@ -14,17 +14,17 @@ #include "mozilla/dom/bluetooth/BluetoothTypes.h" #include "mozilla/Services.h" #include "mozilla/StaticPtr.h" #include "nsContentUtils.h" #include "nsIAudioManager.h" #include "nsIDOMIccInfo.h" #include "nsIIccProvider.h" #include "nsIMobileConnectionInfo.h" -#include "nsIMobileConnectionProvider.h" +#include "nsIMobileConnectionService.h" #include "nsIMobileNetworkInfo.h" #include "nsIObserverService.h" #include "nsISettingsService.h" #include "nsITelephonyService.h" #include "nsRadioInterfaceLayer.h" #include "nsServiceManagerUtils.h" #include "nsThreadUtils.h" @@ -610,18 +610,18 @@ BluetoothHfpManager::HandleVolumeChanged sBluetoothHfpInterface->VolumeControl(HFP_VOLUME_TYPE_SPEAKER, mCurrentVgs, new VolumeControlResultHandler()); } } void BluetoothHfpManager::HandleVoiceConnectionChanged(uint32_t aClientId) { - nsCOMPtr<nsIMobileConnectionProvider> connection = - do_GetService(NS_RILCONTENTHELPER_CONTRACTID); + nsCOMPtr<nsIMobileConnectionService> connection = + do_GetService(NS_MOBILE_CONNECTION_SERVICE_CONTRACTID); NS_ENSURE_TRUE_VOID(connection); nsCOMPtr<nsIMobileConnectionInfo> voiceInfo; connection->GetVoiceConnectionInfo(aClientId, getter_AddRefs(voiceInfo)); NS_ENSURE_TRUE_VOID(voiceInfo); nsString type; voiceInfo->GetType(type);
--- a/dom/bluetooth2/bluez/BluetoothHfpManager.cpp +++ b/dom/bluetooth2/bluez/BluetoothHfpManager.cpp @@ -23,17 +23,17 @@ #include "nsIObserverService.h" #include "nsISettingsService.h" #include "nsServiceManagerUtils.h" #ifdef MOZ_B2G_RIL #include "nsIDOMIccInfo.h" #include "nsIIccProvider.h" #include "nsIMobileConnectionInfo.h" -#include "nsIMobileConnectionProvider.h" +#include "nsIMobileConnectionService.h" #include "nsIMobileNetworkInfo.h" #include "nsITelephonyService.h" #include "nsRadioInterfaceLayer.h" #endif /** * BRSF bitmask of AG supported features. See 4.34.1 "Bluetooth Defined AT * Capabilities" in Bluetooth hands-free profile 1.6 @@ -601,18 +601,18 @@ BluetoothHfpManager::HandleVolumeChanged SendCommand(RESPONSE_VGS, mCurrentVgs); } } #ifdef MOZ_B2G_RIL void BluetoothHfpManager::HandleVoiceConnectionChanged(uint32_t aClientId) { - nsCOMPtr<nsIMobileConnectionProvider> connection = - do_GetService(NS_RILCONTENTHELPER_CONTRACTID); + nsCOMPtr<nsIMobileConnectionService> connection = + do_GetService(NS_MOBILE_CONNECTION_SERVICE_CONTRACTID); NS_ENSURE_TRUE_VOID(connection); nsCOMPtr<nsIMobileConnectionInfo> voiceInfo; connection->GetVoiceConnectionInfo(aClientId, getter_AddRefs(voiceInfo)); NS_ENSURE_TRUE_VOID(voiceInfo); nsString type; voiceInfo->GetType(type);