Bug 1102703: (2/10) Extend internal interfaces to sync with android lollipop and bluez 5.26 (a2dp) r=shawnjohnjr
authorBruce Sun <brsun@mozilla.com>
Fri, 09 Jan 2015 13:34:28 +0800
changeset 250507 966899f3040027eee652d1aa43d2822a30d4d4dd
parent 250506 55358ad9f8332747916a9f9cbc9ac0308ada3aa2
child 250508 b852f5939562a6498a82631584ab4f7621164ad5
push idunknown
push userunknown
push dateunknown
reviewersshawnjohnjr
bugs1102703
milestone37.0a1
Bug 1102703: (2/10) Extend internal interfaces to sync with android lollipop and bluez 5.26 (a2dp) r=shawnjohnjr
dom/bluetooth/BluetoothInterface.h
dom/bluetooth/bluedroid/BluetoothA2dpHALInterface.cpp
--- a/dom/bluetooth/BluetoothInterface.h
+++ b/dom/bluetooth/BluetoothInterface.h
@@ -258,16 +258,22 @@ public:
                               const nsAString& aBdAddr)
   { }
 
   virtual void
   AudioStateNotification(BluetoothA2dpAudioState aState,
                          const nsAString& aBdAddr)
   { }
 
+  virtual void
+  AudioConfigNotification(const nsAString& aBdAddr,
+                          uint32_t aSampleRate,
+                          uint8_t aChannelCount)
+  { }
+
 protected:
   BluetoothA2dpNotificationHandler()
   { }
 };
 
 class BluetoothA2dpResultHandler
 {
 public:
--- a/dom/bluetooth/bluedroid/BluetoothA2dpHALInterface.cpp
+++ b/dom/bluetooth/bluedroid/BluetoothA2dpHALInterface.cpp
@@ -70,16 +70,22 @@ struct BluetoothA2dpHALCallback
     ConnectionStateNotification;
 
   typedef BluetoothNotificationHALRunnable2<
     A2dpNotificationHandlerWrapper, void,
     BluetoothA2dpAudioState, nsString,
     BluetoothA2dpAudioState, const nsAString&>
     AudioStateNotification;
 
+  typedef BluetoothNotificationHALRunnable3<
+    A2dpNotificationHandlerWrapper, void,
+    nsString, uint32_t, uint8_t,
+    const nsAString&, uint32_t, uint8_t>
+    AudioConfigNotification;
+
   // Bluedroid A2DP callbacks
 
   static void
   ConnectionState(btav_connection_state_t aState, bt_bdaddr_t* aBdAddr)
   {
     ConnectionStateNotification::Dispatch(
       &BluetoothA2dpNotificationHandler::ConnectionStateNotification,
       aState, aBdAddr);