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

Commit b52ea940 authored by Myles Watson's avatar Myles Watson Committed by android-build-merger
Browse files

Merge "Clean up some more #defines" 

am: d9dd7b63

Change-Id: I523553f266bea5d78b3ff799ca1d68e7efa59bfc
parents 0ba4a70b d9dd7b63

system/bta/hh/bta_hh_le.cc

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
using std::vector;



#ifndef BTA_HH_LE_RECONN

#define BTA_HH_LE_RECONN true

#define BTA_HH_LE_RECONN TRUE

#endif



#define BTA_HH_APP_ID_LE 0xff

system/bta/include/bta_hh_api.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
 *  Constants and Type Definitions

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

#ifndef BTA_HH_DEBUG

#define BTA_HH_DEBUG true

#define BTA_HH_DEBUG TRUE

#endif



#ifndef BTA_HH_SSR_MAX_LATENCY_DEF

system/bta/include/bta_hl_api.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
 ****************************************************************************/

/* Extra Debug Code */

#ifndef BTA_HL_DEBUG

#define BTA_HL_DEBUG true

#define BTA_HL_DEBUG TRUE

#endif



#ifndef BTA_HL_NUM_APPS

system/stack/btm/btm_ble.cc

+1 −1
Original line number Diff line number Diff line
@@ -2436,7 +2436,7 @@ void btm_ble_reset_id(void) { 
  btsnd_hcic_ble_rand((void*)btm_ble_process_ir);

}



#if BTM_BLE_CONFORMANCE_TESTING == true

#if BTM_BLE_CONFORMANCE_TESTING == TRUE

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

 *

 * Function         btm_ble_set_no_disc_if_pair_fail

system/stack/btm/btm_pm.cc

+0 −7
Original line number Diff line number Diff line
@@ -77,13 +77,6 @@ static tBTM_STATUS btm_pm_snd_md_req(uint8_t pm_id, int link_ind, 
                                     tBTM_PM_PWR_MD* p_mode);

static const char* mode_to_string(tBTM_PM_MODE mode);



/*

#ifdef BTM_PM_DEBUG

#undef BTM_PM_DEBUG

#define BTM_PM_DEBUG    true

#endif

*/



#if (BTM_PM_DEBUG == TRUE)

const char* btm_pm_state_str[] = {"pm_active_state", "pm_hold_state",

                                  "pm_sniff_state", "pm_park_state",