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

Commit 624a3c46 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "btif: update a few status variables when reporting bond state changes"... 

Merge "btif: update a few status variables when reporting bond state changes" am: 326fc324 am: 74ca8558 am: 3a1459f9 am: 8e296b0c

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



Change-Id: I39926c2703152aae3e37731403e3d59d9ad8fa32
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 486cd106 8e296b0c

system/btif/src/btif_dm.cc

+9 −6
Original line number Diff line number Diff line
@@ -2019,19 +2019,22 @@ void btif_dm_create_bond_out_of_band(const RawAddress bd_addr, 
          break;

        case BTM_OOB_PRESENT_256:

          LOG_INFO("Using P256");

          [[fallthrough]];

        default:

          // TODO(181889116):

          // Upgrade to support p256 (for now we just ignore P256)

          // because the controllers do not yet support it.

          bond_state_changed(BT_STATUS_UNSUPPORTED, bd_addr,

                             BT_BOND_STATE_NONE);

          return;

        default:

          LOG_ERROR("Invalid data present for controller: %d",

                    oob_cb.data_present);

          bond_state_changed(BT_STATUS_FAIL, bd_addr, BT_BOND_STATE_NONE);

          bond_state_changed(BT_STATUS_PARM_INVALID, bd_addr,

                             BT_BOND_STATE_NONE);

          return;

      }

      pairing_cb.is_local_initiated = true;

      LOG_ERROR("Classic not implemented yet");

      bond_state_changed(BT_STATUS_FAIL, bd_addr, BT_BOND_STATE_NONE);

      bond_state_changed(BT_STATUS_UNSUPPORTED, bd_addr, BT_BOND_STATE_NONE);

      return;

    case BT_TRANSPORT_LE: {

      // Guess default RANDOM for address type for LE
@@ -2066,7 +2069,7 @@ void btif_dm_create_bond_out_of_band(const RawAddress bd_addr, 
    }

    default:

      LOG_ERROR("Invalid transport: %d", transport);

      bond_state_changed(BT_STATUS_FAIL, bd_addr, BT_BOND_STATE_NONE);

      bond_state_changed(BT_STATUS_PARM_INVALID, bd_addr, BT_BOND_STATE_NONE);

      return;

  }

}
@@ -2123,7 +2126,7 @@ void btif_dm_cancel_bond(const RawAddress bd_addr) { 
void btif_dm_hh_open_failed(RawAddress* bdaddr) {

  if (pairing_cb.state == BT_BOND_STATE_BONDING &&

      *bdaddr == pairing_cb.bd_addr) {

    bond_state_changed(BT_STATUS_FAIL, *bdaddr, BT_BOND_STATE_NONE);

    bond_state_changed(BT_STATUS_RMT_DEV_DOWN, *bdaddr, BT_BOND_STATE_NONE);

  }

}

system/btif/src/btif_hh.cc

+2 −2
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ bt_status_t btif_hh_connect(const RawAddress* bd_addr) { 
    BTIF_TRACE_WARNING(

        "%s: Error, exceeded the maximum supported HID device number %d",

        __func__, BTIF_HH_MAX_HID);

    return BT_STATUS_FAIL;

    return BT_STATUS_NOMEM;

  }



  for (int i = 0; i < BTIF_HH_MAX_ADDED_DEV; i++) {
@@ -582,7 +582,7 @@ bt_status_t btif_hh_connect(const RawAddress* bd_addr) { 
                 << " added but addition failed";

      added_dev->bd_addr = RawAddress::kEmpty;

      added_dev->dev_handle = BTA_HH_INVALID_HANDLE;

      return BT_STATUS_FAIL;

      return BT_STATUS_NOMEM;

    }

  }