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

Commit 3cc9aabf authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Rename BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT to BT_PROPERTY_ADAPTER_DISCOVERABLE_TIMEOUT"

parents a51bd609 b68a4b51

system/btcore/fuzzer/btcore_property_fuzzer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ void BTCorePropertyFuzzer::process(const uint8_t* data, size_t size) { 
  property_free(property);



  uint32_t timeout = mFdp->ConsumeIntegral<uint32_t>();

  property = property_new_discovery_timeout(timeout);

  (void)property_as_discovery_timeout(property);

  property = property_new_discoverable_timeout(timeout);

  (void)property_as_discoverable_timeout(property);

  property_free(property);



  std::string name = mFdp->ConsumeRandomLengthString(kRandomStringLength);

system/btcore/include/property.h

+3 −3
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ bool property_equals(const bt_property_t* p1, const bt_property_t* p2); 
bt_property_t* property_new_addr(const RawAddress* addr);

bt_property_t* property_new_device_class(const bt_device_class_t* dc);

bt_property_t* property_new_device_type(bt_device_type_t device_type);

bt_property_t* property_new_discovery_timeout(const uint32_t timeout);

bt_property_t* property_new_discoverable_timeout(const uint32_t timeout);

bt_property_t* property_new_name(const char* name);

bt_property_t* property_new_rssi(const int8_t rssi);

bt_property_t* property_new_scan_mode(bt_scan_mode_t scan_mode);
@@ -62,7 +62,7 @@ void property_free_array(bt_property_t* properties, size_t count); 
bool property_is_addr(const bt_property_t* property);

bool property_is_device_class(const bt_property_t* property);

bool property_is_device_type(const bt_property_t* property);

bool property_is_discovery_timeout(const bt_property_t* property);

bool property_is_discoverable_timeout(const bt_property_t* property);

bool property_is_name(const bt_property_t* property);

bool property_is_rssi(const bt_property_t* property);

bool property_is_scan_mode(const bt_property_t* property);
@@ -74,7 +74,7 @@ const RawAddress* property_as_addr(const bt_property_t* property); 
const bt_device_class_t* property_as_device_class(

    const bt_property_t* property);

bt_device_type_t property_as_device_type(const bt_property_t* property);

uint32_t property_as_discovery_timeout(const bt_property_t* property);

uint32_t property_as_discoverable_timeout(const bt_property_t* property);

const bt_bdname_t* property_as_name(const bt_property_t* property);

int8_t property_as_rssi(const bt_property_t* property);

bt_scan_mode_t property_as_scan_mode(const bt_property_t* property);

system/btcore/src/property.cc

+6 −6
Original line number Diff line number Diff line
@@ -98,9 +98,9 @@ bt_property_t* property_new_device_type(bt_device_type_t type) { 
                       BT_PROPERTY_TYPE_OF_DEVICE);

}



bt_property_t* property_new_discovery_timeout(const uint32_t timeout) {

bt_property_t* property_new_discoverable_timeout(const uint32_t timeout) {

  return property_new_((void*)&timeout, sizeof(uint32_t),

                       BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT);

                       BT_PROPERTY_ADAPTER_DISCOVERABLE_TIMEOUT);

}



bt_property_t* property_new_name(const char* name) {
@@ -151,9 +151,9 @@ bool property_is_device_type(const bt_property_t* property) { 
  return property->type == BT_PROPERTY_TYPE_OF_DEVICE;

}



bool property_is_discovery_timeout(const bt_property_t* property) {

bool property_is_discoverable_timeout(const bt_property_t* property) {

  CHECK(property != NULL);

  return property->type == BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT;

  return property->type == BT_PROPERTY_ADAPTER_DISCOVERABLE_TIMEOUT;

}



bool property_is_name(const bt_property_t* property) {
@@ -193,8 +193,8 @@ bt_device_type_t property_as_device_type(const bt_property_t* property) { 
  return *(const bt_device_type_t*)property->val;

}



uint32_t property_as_discovery_timeout(const bt_property_t* property) {

  CHECK(property_is_discovery_timeout(property));

uint32_t property_as_discoverable_timeout(const bt_property_t* property) {

  CHECK(property_is_discoverable_timeout(property));

  return *(const uint32_t*)property->val;

}

system/btcore/test/property_test.cc

+3 −3
Original line number Diff line number Diff line
@@ -81,13 +81,13 @@ TEST_F(PropertyTest, device_type) { 


TEST_F(PropertyTest, discovery_timeout) {

  uint32_t timeout0 = 12345;

  bt_property_t* property = property_new_discovery_timeout(timeout0);

  bt_property_t* property = property_new_discoverable_timeout(timeout0);



  EXPECT_EQ(timeout0, *(uint32_t*)property->val);

  EXPECT_EQ(BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT, property->type);

  EXPECT_EQ(BT_PROPERTY_ADAPTER_DISCOVERABLE_TIMEOUT, property->type);

  EXPECT_EQ((int)sizeof(uint32_t), property->len);



  uint32_t timeout1 = property_as_discovery_timeout(property);

  uint32_t timeout1 = property_as_discoverable_timeout(property);

  EXPECT_EQ(timeout0, timeout1);



  property_free(property);

system/btif/src/bluetooth.cc

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static int set_adapter_property(const bt_property_t* property) { 
  switch (property->type) {

    case BT_PROPERTY_BDNAME:

    case BT_PROPERTY_ADAPTER_SCAN_MODE:

    case BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT:

    case BT_PROPERTY_ADAPTER_DISCOVERABLE_TIMEOUT:

    case BT_PROPERTY_CLASS_OF_DEVICE:

    case BT_PROPERTY_LOCAL_IO_CAPS:

    case BT_PROPERTY_LOCAL_IO_CAPS_BLE: