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

Commit c5c2cba4 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Fix bad UUID comparison when adding GATT service 

am: 681a5c95

Change-Id: I8552b9aa41c0852672a5ecf63ea39b8a289d27df
parents 69ec19f2 681a5c95

system/btif/src/btif_gatt_server.cc

+2 −2
Original line number Diff line number Diff line
@@ -366,8 +366,8 @@ static void add_service_impl(int server_if, 
  // TODO(jpawlowski): btif should be a pass through layer, and no checks should

  // be made here. This exception is added only until GATT server code is

  // refactored, and one can distinguish stack-internal aps from external apps

  if (memcmp(&service[0].uuid, &restricted_uuid1, sizeof(bt_uuid_t)) ||

      memcmp(&service[0].uuid, &restricted_uuid2, sizeof(bt_uuid_t))) {

  if (memcmp(&service[0].uuid, &restricted_uuid1, sizeof(bt_uuid_t)) == 0 ||

      memcmp(&service[0].uuid, &restricted_uuid2, sizeof(bt_uuid_t)) == 0) {

    LOG_ERROR(LOG_TAG, "%s: Attept to register restricted service", __func__);

    HAL_CBACK(bt_gatt_callbacks, server->service_added_cb, BT_STATUS_FAIL,

              server_if, std::move(service));