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

Commit adacf466 authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge "Remove unused config" am: 655d637c am: a88a1c87 am: c66494bf am:... 

Merge "Remove unused config" am: 655d637c am: a88a1c87 am: c66494bf am: b92296af am: ec7c6516

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2580395



Change-Id: Ice870f99e1973c419908b62ed634af6f0042d11c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4f455cd7 ec7c6516

system/device/include/device_iot_conf_defs.h

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 


#define IOT_CONF_KEY_SECTION_ADAPTER "Adapter"

#define IOT_CONF_KEY_ADDRESS "Address"

#define IOT_CONF_KEY_BT_ONOFF_COUNT "BTOnOffCount"



#define IOT_CONF_KEY_REMOTE_NAME "Name"

#define IOT_CONF_KEY_DEVCLASS "DevClass"

system/device/src/device_iot_config_int.cc

+0 −2
Original line number Diff line number Diff line
@@ -162,8 +162,6 @@ future_t* device_iot_config_module_init(void) { 


future_t* device_iot_config_module_start_up(void) {

  LOG_INFO("");

  device_iot_config_int_add_one(IOT_CONF_KEY_SECTION_ADAPTER,

                                IOT_CONF_KEY_BT_ONOFF_COUNT);

  return future_new_immediate(FUTURE_SUCCESS);

}

system/device/test/device_iot_config_test.cc

+0 −3
Original line number Diff line number Diff line
@@ -711,9 +711,6 @@ TEST_F(DeviceIotConfigModuleTest, test_device_iot_config_module_start_up) { 
    EXPECT_EQ(get_func_call_count("config_new"), 0);

    EXPECT_EQ(get_func_call_count("config_new_empty"), 0);

    EXPECT_EQ(get_func_call_count("alarm_free"), 0);

    EXPECT_EQ(get_func_call_count("config_get_int"), 1);

    EXPECT_EQ(get_func_call_count("config_set_int"), 1);

    EXPECT_EQ(get_func_call_count("alarm_set"), 1);

    EXPECT_EQ(get_func_call_count("future_new_immediate"), 1);

  }