Merge "Revert "gecko: bluetooth: Update callbacks to match bluetooth.h""

patch/all/gecko/Update-callbacks-to-match-bluetooth.h.patch

-From d8063ba3e5cae75fe6f9407e63166d7450723d79 Mon Sep 17 00:00:00 2001
-From: Greg Grisco <ggrisco@codeaurora.org>
-Date: Wed, 19 Feb 2014 09:27:00 -0800
-Subject: [PATCH] Update callbacks to match bluetooth.h
-
-Change-Id: Icf999d026cdecfb1e316352325d93b4f7bf9db56
----
- dom/bluedroid/BluetoothServiceBluedroid.cpp   |    9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp b/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp
-index 560f165..3649796 100644
---- a/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp
-+++ b/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp
-@@ -489,8 +489,14 @@ DiscoveryStateChangedCallback(bt_discovery_state_t aState)
- }
- 
- static void
-+WakeStateChangedCallback(bt_state_t state)
-+{
-+}
-+
-+static void
- PinRequestCallback(bt_bdaddr_t* aRemoteBdAddress,
--                   bt_bdname_t* aRemoteBdName, uint32_t aRemoteClass)
-+                   bt_bdname_t* aRemoteBdName, uint32_t aRemoteClass, uint8_t
-+                   secure)
- {
-   MOZ_ASSERT(!NS_IsMainThread());
- 
-@@ -629,6 +635,7 @@ bt_callbacks_t sBluetoothCallbacks =
-   RemoteDevicePropertiesCallback,
-   DeviceFoundCallback,
-   DiscoveryStateChangedCallback,
-+  WakeStateChangedCallback,
-   PinRequestCallback,
-   SspRequestCallback,
-   BondStateChangedCallback,
--- 
-1.7.8.3
-