From 24baa470c0aeb9fe638224fbf1798bb72d70d38e Mon Sep 17 00:00:00 2001
From: Carol Yang <cyang@codeaurora.org>
Date: Mon, 9 May 2016 09:46:25 -0700
Subject: [PATCH] Update BT patch

Change-Id: If8dd0fc395e5a72cdbb9e3753457b7ec9e46a6a5
---
 ...-Apply-fixes-in-BT-to-compile-with-M.patch | 363 +++---------------
 1 file changed, 44 insertions(+), 319 deletions(-)

diff --git a/patch/all/gecko/0002-Apply-fixes-in-BT-to-compile-with-M.patch b/patch/all/gecko/0002-Apply-fixes-in-BT-to-compile-with-M.patch
index 64bd7e7..3db1cca 100644
--- a/patch/all/gecko/0002-Apply-fixes-in-BT-to-compile-with-M.patch
+++ b/patch/all/gecko/0002-Apply-fixes-in-BT-to-compile-with-M.patch
@@ -1,325 +1,50 @@
-From b2b14c2651bbb2e063d8caa056482a6b48180e8b Mon Sep 17 00:00:00 2001
-From: Indrajeet Kumar <ikumar@codeaurora.org>
-Date: Tue, 29 Mar 2016 14:32:17 -0700
-Subject: [PATCH 2/3] Apply fixes in BT to compile with M
+From 07f6e652ac77b8f4d338bbe179d3221d432d5a9e Mon Sep 17 00:00:00 2001
+From: Carol Yang <cyang@codeaurora.org>
+Date: Mon, 9 May 2016 10:26:04 -0700
+Subject: [PATCH] Apply fixes in BT to compile with M
 
-Change-Id: I8379715fb1abe8bfcf2ff933e919c659becec45e
+Change-Id: I8c99bbccc44fdf6649575d56492da4052c9fc6b4
 ---
- .../bluedroid/BluetoothA2dpHALInterface.cpp        |  5 ++
- .../bluedroid/BluetoothAvrcpHALInterface.cpp       | 89 ++++++++++++++++++++++
- .../mozapps/update/updater/automounter_gonk.cpp    |  1 +
- widget/gonk/GonkPermission.cpp                     |  2 +-
- 4 files changed, 96 insertions(+), 1 deletion(-)
+ configure.in            | 5 +++++
+ dom/bluetooth/moz.build | 2 ++
+ 2 files changed, 7 insertions(+)
 
-diff --git a/dom/bluetooth/bluedroid/BluetoothA2dpHALInterface.cpp b/dom/bluetooth/bluedroid/BluetoothA2dpHALInterface.cpp
-index 513ee14..f054d4c 100644
---- a/dom/bluetooth/bluedroid/BluetoothA2dpHALInterface.cpp
-+++ b/dom/bluetooth/bluedroid/BluetoothA2dpHALInterface.cpp
-@@ -139,7 +139,12 @@ BluetoothA2dpHALInterface::Init(
- 
-   sA2dpNotificationHandler = aNotificationHandler;
- 
-+#if ANDROID_VERSION >= 23
-+  //maxConnections = 1, multiCastState = 0
-+  bt_status_t status = mInterface->init(&sCallbacks, 1, 0);
-+#else
-   bt_status_t status = mInterface->init(&sCallbacks);
-+#endif
- 
-   if (aRes) {
-     DispatchBluetoothA2dpHALResult(aRes,
-diff --git a/dom/bluetooth/bluedroid/BluetoothAvrcpHALInterface.cpp b/dom/bluetooth/bluedroid/BluetoothAvrcpHALInterface.cpp
-index 4e7c606..f73e909 100644
---- a/dom/bluetooth/bluedroid/BluetoothAvrcpHALInterface.cpp
-+++ b/dom/bluetooth/bluedroid/BluetoothAvrcpHALInterface.cpp
-@@ -129,21 +129,33 @@ struct BluetoothAvrcpCallback
- 
- #if ANDROID_VERSION >= 18
-   static void
-+#if ANDROID_VERSION >= 23
-+  GetPlayStatus(bt_bdaddr_t *bd_addr)
-+#else
-   GetPlayStatus()
-+#endif
-   {
-     GetPlayStatusNotification::Dispatch(
-       &BluetoothAvrcpNotificationHandler::GetPlayStatusNotification);
-   }
- 
-   static void
-+#if ANDROID_VERSION >= 23
-+  ListPlayerAppAttr(bt_bdaddr_t *bd_addr)
-+#else
-   ListPlayerAppAttr()
-+#endif
-   {
-     ListPlayerAppAttrNotification::Dispatch(
-       &BluetoothAvrcpNotificationHandler::ListPlayerAppAttrNotification);
-   }
- 
-   static void
-+#if ANDROID_VERSION >= 23
-+  ListPlayerAppValues(btrc_player_attr_t aAttrId, bt_bdaddr_t *bd_addr)
-+#else
-   ListPlayerAppValues(btrc_player_attr_t aAttrId)
-+#endif
-   {
-     ListPlayerAppValuesNotification::Dispatch(
-       &BluetoothAvrcpNotificationHandler::ListPlayerAppValuesNotification,
-@@ -151,7 +163,11 @@ struct BluetoothAvrcpCallback
-   }
- 
-   static void
-+#if ANDROID_VERSION >= 23
-+  GetPlayerAppValue(uint8_t aNumAttrs, btrc_player_attr_t* aAttrs, bt_bdaddr_t *bd_addr)
-+#else
-   GetPlayerAppValue(uint8_t aNumAttrs, btrc_player_attr_t* aAttrs)
-+#endif
-   {
-     GetPlayerAppValueNotification::Dispatch(
-       &BluetoothAvrcpNotificationHandler::GetPlayerAppValueNotification,
-@@ -159,7 +175,11 @@ struct BluetoothAvrcpCallback
-   }
- 
-   static void
-+#if ANDROID_VERSION >= 23
-+  GetPlayerAppAttrsText(uint8_t aNumAttrs, btrc_player_attr_t* aAttrs, bt_bdaddr_t *bd_addr)
-+#else
-   GetPlayerAppAttrsText(uint8_t aNumAttrs, btrc_player_attr_t* aAttrs)
-+#endif
-   {
-     GetPlayerAppAttrsTextNotification::Dispatch(
-       &BluetoothAvrcpNotificationHandler::GetPlayerAppAttrsTextNotification,
-@@ -167,7 +187,11 @@ struct BluetoothAvrcpCallback
-   }
- 
-   static void
-+#if ANDROID_VERSION >= 23
-+  GetPlayerAppValuesText(uint8_t aAttrId, uint8_t aNumVals, uint8_t* aVals, bt_bdaddr_t *bd_addr)
-+#else
-   GetPlayerAppValuesText(uint8_t aAttrId, uint8_t aNumVals, uint8_t* aVals)
-+#endif
-   {
-     GetPlayerAppValuesTextNotification::Dispatch(
-       &BluetoothAvrcpNotificationHandler::GetPlayerAppValuesTextNotification,
-@@ -175,7 +199,11 @@ struct BluetoothAvrcpCallback
-   }
- 
-   static void
-+#if ANDROID_VERSION >= 23
-+  SetPlayerAppValue(btrc_player_settings_t* aVals, bt_bdaddr_t *bd_addr)
-+#else
-   SetPlayerAppValue(btrc_player_settings_t* aVals)
-+#endif
-   {
-     SetPlayerAppValueNotification::Dispatch(
-       &BluetoothAvrcpNotificationHandler::SetPlayerAppValueNotification,
-@@ -183,7 +211,11 @@ struct BluetoothAvrcpCallback
-   }
- 
-   static void
-+#if ANDROID_VERSION >= 23
-+  GetElementAttr(uint8_t aNumAttrs, btrc_media_attr_t* aAttrs, bt_bdaddr_t *bd_addr)
-+#else
-   GetElementAttr(uint8_t aNumAttrs, btrc_media_attr_t* aAttrs)
-+#endif
-   {
-     GetElementAttrNotification::Dispatch(
-       &BluetoothAvrcpNotificationHandler::GetElementAttrNotification,
-@@ -191,7 +223,11 @@ struct BluetoothAvrcpCallback
-   }
- 
-   static void
-+#if ANDROID_VERSION >= 23
-+  RegisterNotification(btrc_event_id_t aEvent, uint32_t aParam, bt_bdaddr_t *bd_addr)
-+#else
-   RegisterNotification(btrc_event_id_t aEvent, uint32_t aParam)
-+#endif
-   {
-     RegisterNotificationNotification::Dispatch(
-       &BluetoothAvrcpNotificationHandler::RegisterNotificationNotification,
-@@ -209,7 +245,11 @@ struct BluetoothAvrcpCallback
-   }
- 
-   static void
-+#if ANDROID_VERSION >= 23
-+  VolumeChange(uint8_t aVolume, uint8_t aCType, bt_bdaddr_t *bd_addr)
-+#else
-   VolumeChange(uint8_t aVolume, uint8_t aCType)
-+#endif
-   {
-     VolumeChangeNotification::Dispatch(
-       &BluetoothAvrcpNotificationHandler::VolumeChangeNotification,
-@@ -217,7 +257,11 @@ struct BluetoothAvrcpCallback
-   }
- 
-   static void
-+#if ANDROID_VERSION >= 23
-+  PassthroughCmd(int aId, int aKeyState, bt_bdaddr_t *bd_addr)
-+#else
-   PassthroughCmd(int aId, int aKeyState)
-+#endif
-   {
-     PassthroughCmdNotification::Dispatch(
-       &BluetoothAvrcpNotificationHandler::PassthroughCmdNotification,
-@@ -277,7 +321,12 @@ BluetoothAvrcpHALInterface::Init(
-   sAvrcpNotificationHandler = aNotificationHandler;
- 
- #if ANDROID_VERSION >= 18
-+#if ANDROID_VERSION >= 23
-+  // maxAvrcpConnections = 1
-+  bt_status_t status = mInterface->init(&sCallbacks, 1);
-+#else
-   bt_status_t status = mInterface->init(&sCallbacks);
-+#endif // ANDROID_VERSION >= 23
- #else
-   bt_status_t status = BT_STATUS_UNSUPPORTED;
- #endif
-@@ -312,7 +361,11 @@ BluetoothAvrcpHALInterface::GetPlayStatusRsp(
-   btrc_play_status_t playStatus = BTRC_PLAYSTATE_STOPPED;
- 
-   if (!(NS_FAILED(Convert(aPlayStatus, playStatus)))) {
-+#if ANDROID_VERSION >= 23
-+    status = mInterface->get_play_status_rsp(playStatus, aSongLen, aSongPos, NULL);
-+#else
-     status = mInterface->get_play_status_rsp(playStatus, aSongLen, aSongPos);
-+#endif
-   } else {
-     status = BT_STATUS_PARM_INVALID;
-   }
-@@ -339,7 +392,11 @@ BluetoothAvrcpHALInterface::ListPlayerAppAttrRsp(
-   nsAutoArrayPtr<btrc_player_attr_t> pAttrs;
- 
-   if (NS_SUCCEEDED(Convert(pAttrsArray, pAttrs))) {
-+#if ANDROID_VERSION >= 23
-+    status = mInterface->list_player_app_attr_rsp((uint8_t)aNumAttr, pAttrs, NULL);
-+#else
-     status = mInterface->list_player_app_attr_rsp(aNumAttr, pAttrs);
-+#endif
-   } else {
-     status = BT_STATUS_PARM_INVALID;
-   }
-@@ -359,7 +416,11 @@ BluetoothAvrcpHALInterface::ListPlayerAppValueRsp(
-   int aNumVal, uint8_t* aPVals, BluetoothAvrcpResultHandler* aRes)
- {
- #if ANDROID_VERSION >= 18
-+#if ANDROID_VERSION >= 23
-+  bt_status_t status = mInterface->list_player_app_value_rsp(aNumVal, aPVals, NULL);
-+#else
-   bt_status_t status = mInterface->list_player_app_value_rsp(aNumVal, aPVals);
-+#endif
- #else
-   bt_status_t status = BT_STATUS_UNSUPPORTED;
- #endif
-@@ -385,7 +446,11 @@ BluetoothAvrcpHALInterface::GetPlayerAppValueRsp(
-   NS_NOTREACHED("Conversion function missing");
- 
-   if (false /* TODO: we don't support any player app values currently */) {
-+#if ANDROID_VERSION >= 23
-+    status = mInterface->get_player_app_value_rsp(&pVals, NULL);
-+#else
-     status = mInterface->get_player_app_value_rsp(&pVals);
-+#endif
-   } else {
-     status = BT_STATUS_PARM_INVALID;
-   }
-@@ -414,7 +479,11 @@ BluetoothAvrcpHALInterface::GetPlayerAppAttrTextRsp(
-   NS_NOTREACHED("Conversion function missing");
- 
-   if (false /* TODO: we don't support any attributes currently */) {
-+#if ANDROID_VERSION >= 23
-+    status = mInterface->get_player_app_attr_text_rsp(aNumAttr, aPAttrs, NULL);
-+#else
-     status = mInterface->get_player_app_attr_text_rsp(aNumAttr, aPAttrs);
-+#endif
-   } else {
-     status = BT_STATUS_PARM_INVALID;
-   }
-@@ -443,7 +512,11 @@ BluetoothAvrcpHALInterface::GetPlayerAppValueTextRsp(
-   NS_NOTREACHED("Conversion function missing");
- 
-   if (false /* TODO: we don't support any values currently */) {
-+#if ANDROID_VERSION >= 23
-+    status = mInterface->get_player_app_value_text_rsp(aNumVal, pVals, NULL);
-+#else
-     status = mInterface->get_player_app_value_text_rsp(aNumVal, pVals);
-+#endif
-   } else {
-     status = BT_STATUS_PARM_INVALID;
-   }
-@@ -470,7 +543,11 @@ BluetoothAvrcpHALInterface::GetElementAttrRsp(
-   nsAutoArrayPtr<btrc_element_attr_val_t> pAttrs;
- 
-   if (NS_SUCCEEDED(Convert(pAttrsArray, pAttrs))) {
-+#if ANDROID_VERSION >= 23
-+    status = mInterface->get_element_attr_rsp(aNumAttr, pAttrs, NULL);
-+#else
-     status = mInterface->get_element_attr_rsp(aNumAttr, pAttrs);
-+#endif
-   } else {
-     status = BT_STATUS_PARM_INVALID;
-   }
-@@ -495,7 +572,11 @@ BluetoothAvrcpHALInterface::SetPlayerAppValueRsp(
-   btrc_status_t rspStatus = BTRC_STS_BAD_CMD; // silences compiler warning
- 
-   if (NS_SUCCEEDED(Convert(aRspStatus, rspStatus))) {
-+#if ANDROID_VERSION >= 23
-+    status = mInterface->set_player_app_value_rsp(rspStatus, NULL);
-+#else
-     status = mInterface->set_player_app_value_rsp(rspStatus);
-+#endif
-   } else {
-     status = BT_STATUS_PARM_INVALID;
-   }
-@@ -558,7 +639,11 @@ BluetoothAvrcpHALInterface::RegisterNotificationRsp(
-   if (NS_SUCCEEDED(rv) &&
-       NS_SUCCEEDED(Convert(aEvent, event)) &&
-       NS_SUCCEEDED(Convert(aType, type))) {
-+#if ANDROID_VERSION >= 23
-+    status = mInterface->register_notification_rsp(event, type, &param, NULL);
-+#else
-     status = mInterface->register_notification_rsp(event, type, &param);
-+#endif
-   } else {
-     status = BT_STATUS_PARM_INVALID;
-   }
-@@ -578,7 +663,11 @@ BluetoothAvrcpHALInterface::SetVolume(uint8_t aVolume,
-                                       BluetoothAvrcpResultHandler* aRes)
- {
- #if ANDROID_VERSION >= 19
-+#if ANDROID_VERSION >= 23
-+  bt_status_t status = mInterface->set_volume(aVolume, NULL);
-+#else
-   bt_status_t status = mInterface->set_volume(aVolume);
-+#endif
- #else
-   bt_status_t status = BT_STATUS_UNSUPPORTED;
- #endif
-diff --git a/toolkit/mozapps/update/updater/automounter_gonk.cpp b/toolkit/mozapps/update/updater/automounter_gonk.cpp
-index 3dff2a1..1cd04d7 100644
---- a/toolkit/mozapps/update/updater/automounter_gonk.cpp
-+++ b/toolkit/mozapps/update/updater/automounter_gonk.cpp
-@@ -14,6 +14,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#include <string.h>
- 
- #include "automounter_gonk.h"
- #include "updatedefines.h"
-diff --git a/widget/gonk/GonkPermission.cpp b/widget/gonk/GonkPermission.cpp
-index 2eb4c93..0cd2d81 100644
---- a/widget/gonk/GonkPermission.cpp
-+++ b/widget/gonk/GonkPermission.cpp
-@@ -30,7 +30,7 @@
- 
- #undef LOG
- #include <android/log.h>
--#define ALOGE(args...)  __android_log_print(ANDROID_LOG_ERROR, "gonkperm" , ## args)
-+//#define ALOGE(args...)  __android_log_print(ANDROID_LOG_ERROR, "gonkperm" , ## args)
- 
- using namespace android;
- using namespace mozilla;
+diff --git a/configure.in b/configure.in
+index 9cd79af..5902303 100644
+--- a/configure.in
++++ b/configure.in
+@@ -340,6 +340,10 @@ if test -n "$gonkdir" ; then
+         H5OS_MIDI=1
+         LIBS="$LIBS -lc++"
+         android_cxx_stl=libc++
++        MOZ_ARG_ENABLE_BOOL(bluetooth-bdroid-use-caf-extensions,
++        [ --enable-bluetooth-bdroid-use-caf-extensions Enable bluedroid uses caf headers],
++        BLUETOOTH_BDROID_USE_CAF_EXTENSIONS=1,
++        BLUETOOTH_BDROID_USE_CAF_EXTENSIONS= )
+         ;;
+     *)
+         AC_MSG_ERROR([Unsupported platform version: $ANDROID_VERSION])
+@@ -7667,6 +7671,7 @@ AC_SUBST(MOZ_B2G_BT)
+ AC_SUBST(MOZ_B2G_BT_BLUEZ)
+ AC_SUBST(MOZ_B2G_BT_BLUEDROID)
+ AC_SUBST(MOZ_B2G_BT_DAEMON)
++AC_SUBST(BLUETOOTH_BDROID_USE_CAF_EXTENSIONS)
+ 
+ dnl ========================================================
+ dnl = Enable building H5OS proprietary folder - H5OS (Gonk usually)
+diff --git a/dom/bluetooth/moz.build b/dom/bluetooth/moz.build
+index ccb2563..0543bdd 100644
+--- a/dom/bluetooth/moz.build
++++ b/dom/bluetooth/moz.build
+@@ -95,6 +95,8 @@ if CONFIG['MOZ_B2G_BT']:
+             DEFINES['MOZ_B2G_BT_BLUEDROID'] = True
+             if CONFIG['MOZ_B2G_BT_DAEMON']:
+                 DEFINES['MOZ_B2G_BT_DAEMON'] = True
++            if CONFIG['BLUETOOTH_BDROID_USE_CAF_EXTENSIONS']:
++                DEFINES['Q_BLUETOOTH'] = True
+     elif CONFIG['MOZ_ENABLE_DBUS']:
+         CFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
+         CFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
 -- 
 1.8.2.1
 
-- 
GitLab