Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9cc5a03 authored by David Duarte's avatar David Duarte Committed by Automerger Merge Worker
Browse files

Merge changes If53c4ea1,I0a1baf8d,Ic2f72ae5 am: 60f2d957

parents 8db9dab6 60f2d957
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -116,8 +116,6 @@ config("target_defaults") {
  cflags_cc = [ "-std=c++17" ]

  defines = [
    "OS_GENERIC",
    "OS_LINUX_GENERIC",
    "TARGET_FLOSS",
    "EXPORT_SYMBOL=__attribute__((visibility(\"default\")))",
    "FALLTHROUGH_INTENDED=[[clang::fallthrough]]",
+0 −3
Original line number Diff line number Diff line
@@ -600,9 +600,6 @@ cc_test {
            enabled: false,
        },
        android: {
            cflags: [
                "-DOS_ANDROID",
            ],
            sanitize: {
                misc_undefined: ["bounds"],
            },
+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@
#include "bta/ag/bta_ag_int.h"
#include "bta/include/bta_dm_api.h"

#ifdef OS_ANDROID
#ifdef __ANDROID__
#include "bta/le_audio/devices.h"
#endif

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@
#include "bta/include/bta_ag_api.h"
#include "bta/include/utl.h"

#ifdef OS_ANDROID
#ifdef __ANDROID__
#include "bta/le_audio/devices.h"
#endif

@@ -1860,7 +1860,7 @@ void bta_ag_send_bcs(tBTA_AG_SCB* p_scb) {
 *
 ******************************************************************************/
bool bta_ag_is_sco_open_allowed(tBTA_AG_SCB* p_scb, const std::string event) {
#ifdef OS_ANDROID
#ifdef __ANDROID__
  /* Do not open SCO if 1. the dual mode audio system property is enabled,
  2. LEA is active, and 3. LEA is preferred for DUPLEX */
  if (bluetooth::os::GetSystemPropertyBool(
+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@
#define LOG_TAG "bt_bta_dm"

#include <base/logging.h>
#ifdef OS_ANDROID
#ifdef __ANDROID__
#include <bta.sysprop.h>
#endif

@@ -178,7 +178,7 @@ static void bta_dm_ctrl_features_rd_cmpl_cback(tHCI_STATUS result);
// Time to wait after receiving shutdown request to delay the actual shutdown
// process. This time may be zero which invokes immediate shutdown.
static uint64_t get_DisableDelayTimerInMs() {
#ifndef OS_ANDROID
#ifndef __ANDROID__
  return 200;
#else
  static const uint64_t kDisableDelayTimerInMs =
Loading