summaryrefslogtreecommitdiffstats
path: root/bta/dm/bta_dm_main.c
diff options
context:
space:
mode:
authorChris Manton <cmanton@google.com>2014-10-24 09:12:41 -0700
committerAndre Eisenbach <eisenbach@google.com>2015-03-16 16:51:39 -0700
commit1e61ce1ae3fe8ef72443b30907f1cf8acae39674 (patch)
treeea24f8cbf800763aadd3774558058a6ba1eef608 /bta/dm/bta_dm_main.c
parent070fefc7e3b559fbb88d90dd622e1bc5576825cf (diff)
downloadandroid_system_bt-1e61ce1ae3fe8ef72443b30907f1cf8acae39674.tar.gz
android_system_bt-1e61ce1ae3fe8ef72443b30907f1cf8acae39674.tar.bz2
android_system_bt-1e61ce1ae3fe8ef72443b30907f1cf8acae39674.zip
Remove always true definition BTM_EIR_SERVER_INCLUDED
Diffstat (limited to 'bta/dm/bta_dm_main.c')
-rw-r--r--bta/dm/bta_dm_main.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/bta/dm/bta_dm_main.c b/bta/dm/bta_dm_main.c
index 35835c7c7..53a5c132c 100644
--- a/bta/dm/bta_dm_main.c
+++ b/bta/dm/bta_dm_main.c
@@ -121,12 +121,10 @@ const tBTA_DM_ACTION bta_dm_action[] =
bta_dm_ble_get_energy_info, /* BTA_DM_API_BLE_ENERGY_INFO_EVT */
#endif
-#if ( BTM_EIR_SERVER_INCLUDED == TRUE )&&( BTA_EIR_CANNED_UUID_LIST != TRUE )&&(BTA_EIR_SERVER_NUM_CUSTOM_UUID > 0)
+#if ( BTA_EIR_CANNED_UUID_LIST != TRUE )&&(BTA_EIR_SERVER_NUM_CUSTOM_UUID > 0)
bta_dm_update_eir_uuid, /* BTA_DM_API_UPDATE_EIR_UUID_EVT */
#endif
-#if (BTM_EIR_SERVER_INCLUDED == TRUE)
bta_dm_set_eir_config, /* BTA_DM_API_SET_EIR_CONFIG_EVT */
-#endif
bta_dm_enable_test_mode, /* BTA_DM_API_ENABLE_TEST_MODE_EVT */
bta_dm_disable_test_mode, /* BTA_DM_API_DISABLE_TEST_MODE_EVT */