зеркало из https://github.com/mozilla/gecko-dev.git
Bug 979370: Remove |BluetoothService::IsEnabledInternal|, r=echou
The method |IsEnabledInternal| of |BluetoothService| is not used any longer. This patch removes it.
This commit is contained in:
Родитель
a7b1e31f1b
Коммит
23eb2cae61
|
@ -359,15 +359,6 @@ protected:
|
|||
virtual nsresult
|
||||
StopInternal() = 0;
|
||||
|
||||
/**
|
||||
* Platform specific startup functions go here. Usually deals with member
|
||||
* variables, so not static. Guaranteed to be called outside of main thread.
|
||||
*
|
||||
* @return true if Bluetooth is enabled, false otherwise
|
||||
*/
|
||||
virtual bool
|
||||
IsEnabledInternal() = 0;
|
||||
|
||||
/**
|
||||
* Called when XPCOM first creates this service.
|
||||
*/
|
||||
|
|
|
@ -770,14 +770,6 @@ BluetoothServiceBluedroid::StopInternal()
|
|||
return ret;
|
||||
}
|
||||
|
||||
bool
|
||||
BluetoothServiceBluedroid::IsEnabledInternal()
|
||||
{
|
||||
MOZ_ASSERT(!NS_IsMainThread());
|
||||
|
||||
return sIsBtEnabled;
|
||||
}
|
||||
|
||||
nsresult
|
||||
BluetoothServiceBluedroid::GetDefaultAdapterPathInternal(
|
||||
BluetoothReplyRunnable* aRunnable)
|
||||
|
|
|
@ -24,7 +24,6 @@ public:
|
|||
|
||||
virtual nsresult StartInternal();
|
||||
virtual nsresult StopInternal();
|
||||
virtual bool IsEnabledInternal();
|
||||
|
||||
virtual nsresult GetDefaultAdapterPathInternal(
|
||||
BluetoothReplyRunnable* aRunnable);
|
||||
|
|
|
@ -2115,18 +2115,6 @@ BluetoothDBusService::StopInternal()
|
|||
return rv;
|
||||
}
|
||||
|
||||
bool
|
||||
BluetoothDBusService::IsEnabledInternal()
|
||||
{
|
||||
MOZ_ASSERT(!NS_IsMainThread()); // BT thread
|
||||
|
||||
#ifdef MOZ_WIDGET_GONK
|
||||
return sBluedroid.IsEnabled();
|
||||
#else
|
||||
return mEnabled;
|
||||
#endif
|
||||
}
|
||||
|
||||
class DefaultAdapterPathReplyHandler : public DBusReplyHandler
|
||||
{
|
||||
public:
|
||||
|
|
|
@ -53,8 +53,6 @@ public:
|
|||
|
||||
virtual nsresult StopInternal() MOZ_OVERRIDE;
|
||||
|
||||
virtual bool IsEnabledInternal() MOZ_OVERRIDE;
|
||||
|
||||
virtual nsresult GetDefaultAdapterPathInternal(
|
||||
BluetoothReplyRunnable* aRunnable) MOZ_OVERRIDE;
|
||||
|
||||
|
|
|
@ -389,12 +389,6 @@ BluetoothServiceChildProcess::StopInternal()
|
|||
MOZ_CRASH("This should never be called!");
|
||||
}
|
||||
|
||||
bool
|
||||
BluetoothServiceChildProcess::IsEnabledInternal()
|
||||
{
|
||||
MOZ_CRASH("This should never be called!");
|
||||
}
|
||||
|
||||
bool
|
||||
BluetoothServiceChildProcess::IsConnected(uint16_t aServiceUuid)
|
||||
{
|
||||
|
|
|
@ -207,10 +207,6 @@ private:
|
|||
virtual nsresult
|
||||
StopInternal() MOZ_OVERRIDE;
|
||||
|
||||
// This method should never be called.
|
||||
virtual bool
|
||||
IsEnabledInternal() MOZ_OVERRIDE;
|
||||
|
||||
bool
|
||||
IsSignalRegistered(const nsAString& aNodeName) {
|
||||
return !!mBluetoothSignalObserverTable.Get(aNodeName);
|
||||
|
|
Загрузка…
Ссылка в новой задаче