Bug 1102703 - Extend internal interfaces to sync with android lollipop and bluez 5.26 (a2dp). r=shawnjohnjr
☠☠ backed out by b4926227268f ☠ ☠
authorBruce Sun <brsun@mozilla.com>
Thu, 08 Jan 2015 11:46:10 +0800
changeset 248494 411ab2917e49547a133d95282849eff928a59344
parent 248493 50eed0f4edc7036380841901920b4623c7d0f9c9
child 248495 db035be5bc6ccbb71556e4fe7e9f19750daa1a58
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersshawnjohnjr
bugs1102703
milestone37.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
Bug 1102703 - 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);