wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 969314: Cleanup Gonk start/stop code in BluetoothDBusService, r=echou

Browse Source 
This patch removes all unnecessary code when starting and stopping
Gonk in BluetoothDBusService. The change simplifies the respective
methods considerably.
This commit is contained in:
Thomas Zimmermann 2014-02-13 16:28:11 +01:00
parent 7a5ca6f23b
commit fda3904fd3
1 changed files with 9 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
dom/bluetooth/bluez/linux/BluetoothDBusService.cpp
View File

@ -1840,35 +1840,6 @@ BluetoothDBusService::IsReady()
return true;
}
#if MOZ_WIDGET_GONK
static nsresult
StartStopGonkBluetooth(bool aShouldEnable)
{
bool result;
// Platform specific check for gonk until object is divided in
// different implementations per platform. Linux doesn't require
// bluetooth firmware loading, but code should work otherwise.
bool isEnabled = sBluedroid.IsEnabled();
if ((isEnabled && aShouldEnable) || (!isEnabled && !aShouldEnable)) {
return NS_OK;
}
if (aShouldEnable) {
result = sBluedroid.Enable();
} else {
result = sBluedroid.Disable();
}
if (!result) {
BT_WARNING("Could not set gonk bluetooth firmware!");
return NS_ERROR_FAILURE;
}
return NS_OK;
}
#endif
nsresult
BluetoothDBusService::StartInternal()
{
@ -1876,10 +1847,9 @@ BluetoothDBusService::StartInternal()
MOZ_ASSERT(!NS_IsMainThread());
#ifdef MOZ_WIDGET_GONK
nsresult ret = StartStopGonkBluetooth(true);
if (NS_FAILED(ret)) {
return ret;
if (!sBluedroid.Enable()) {
BT_WARNING("Bluetooth not available.");
return NS_ERROR_FAILURE;
}
#endif
@ -2005,10 +1975,13 @@ BluetoothDBusService::StopInternal()
StopDBus();
#ifdef MOZ_WIDGET_GONK
return StartStopGonkBluetooth(false);
#else
return NS_OK;
MOZ_ASSERT(sBluedroid.IsEnabled());
if (!sBluedroid.Disable()) {
return NS_ERROR_FAILURE;
}
#endif
return NS_OK;
}
bool