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

Commit 576b2a85 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge changes Ibe04f9f1,Ib3a40bbb,I2edcc436,I077c2395,I251423f3, ... into main 

* changes:
  Delete unused define: PANU_DISABLED
  Delete unused define: GAP_INCLUDED
  Delete unused define: SDP_RAW_DATA_INCLUDED
  Delete unused define: SDP_DEBUG
  Delete unused define: BTA_AG_CHLD_VAL_ECC
  Delete unused define: BTA_AG_CHLD_VAL
  Delete unused define: BTA_AG_CIND_INFO
  Delete unused define: BTSNOOP_MEM
  Delete unused empty file
parents e863465d 18c33925

system/bta/ag/bta_ag_cfg.cc

+5 −11
Original line number Diff line number Diff line
@@ -30,20 +30,14 @@ 
#include "osi/include/allocator.h"

#include "osi/include/compat.h"



#ifndef BTA_AG_CIND_INFO

/* Set the CIND to match HFP 1.5 */

#define BTA_AG_CIND_INFO                                                       \

  "(\"call\",(0,1)),(\"callsetup\",(0-3)),(\"service\",(0-3)),(\"signal\",(0-" \

  "6)),(\"roam\",(0,1)),(\"battchg\",(0-5)),(\"callheld\",(0-2)),(\"bearer\"," \

  "(0-7))"

#endif

  "(\"call\",(0,1)),(\"callsetup\",(0-3)),(\"service\",(0-1)),(\"signal\",(0-" \

  "5)),(\"roam\",(0,1)),(\"battchg\",(0-5)),(\"callheld\",(0-2))"



#ifndef BTA_AG_CHLD_VAL_ECC

#define BTA_AG_CHLD_VAL_ECC "(0,1,1x,2,2x,3,4)"

#endif

#define BTA_AG_CHLD_VAL_ECC "(0,1,1x,2,2x,3)"



#ifndef BTA_AG_CHLD_VAL

#define BTA_AG_CHLD_VAL "(0,1,2,3,4)"

#endif

#define BTA_AG_CHLD_VAL "(0,1,2,3)"



#ifndef BTA_AG_CONN_TIMEOUT

#define BTA_AG_CONN_TIMEOUT 5000

system/bta/dm/bta_dm_act.cc

+1 −4
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include "btif/include/btif_dm.h"

#include "btif/include/stack_manager.h"

#include "device/include/controller.h"

#include "gap_api.h"

#include "include/bind_helpers.h"

#include "main/shim/acl_api.h"

#include "main/shim/btm_api.h"
@@ -60,10 +61,6 @@ 
#include "types/bluetooth/uuid.h"

#include "types/raw_address.h"



#if (GAP_INCLUDED == TRUE)

#include "gap_api.h"

#endif



using namespace bluetooth::legacy::stack::sdp;

using bluetooth::Uuid;

system/btif/src/btif_debug_btsnoop.cc

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
/******************************************************************************

 *

 *  Copyright 2015 Google Inc.

 *

 *  Licensed under the Apache License, Version 2.0 (the "License");

 *  you may not use this file except in compliance with the License.

 *  You may obtain a copy of the License at:

 *

 *  http://www.apache.org/licenses/LICENSE-2.0

 *

 *  Unless required by applicable law or agreed to in writing, software

 *  distributed under the License is distributed on an "AS IS" BASIS,

 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 *  See the License for the specific language governing permissions and

 *  limitations under the License.

 *

 ******************************************************************************/



#include <mutex>



#include <base/logging.h>

#include <resolv.h>

#include <zlib.h>



#include "internal_include/bt_target.h"

#include "osi/include/properties.h"

#include "osi/include/ringbuffer.h"



#define REDUCE_HCI_TYPE_TO_SIGNIFICANT_BITS(type) ((type) >> 8)



// Total btsnoop memory log buffer size

#ifndef BTSNOOP_MEM_BUFFER_SIZE

#endif



#ifndef __ANDROID__

#else

#endif

system/btif/src/btif_pan.cc

+0 −2
Original line number Diff line number Diff line
@@ -122,9 +122,7 @@ void btif_pan_init() { 
    if (GET_SYSPROP(Pan, nap, true)) {

      role |= BTPAN_ROLE_PANNAP;

    }

#if PANU_DISABLED == FALSE

    role |= BTPAN_ROLE_PANU;

#endif

    btpan_enable(role);

  }

}

system/btif/src/stack_manager.cc

+0 −8
Original line number Diff line number Diff line
@@ -78,14 +78,6 @@ 


// Validate or respond to various conditional compilation flags



#if SDP_RAW_DATA_INCLUDED != TRUE

// Once SDP_RAW_DATA_INCLUDED is no longer exposed via bt_target.h

// this check and error statement may be removed.

#warning \

    "#define SDP_RAW_DATA_INCLUDED preprocessor compilation flag is unsupported"

#error "*** Conditional Compilation Directive error"

#endif



// Once BTA_PAN_INCLUDED is no longer exposed via bt_target.h

// this check and error statement may be removed.

static_assert(