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

Commit c2cdc4ea authored by Ying Hsu's avatar Ying Hsu Committed by Automerger Merge Worker
Browse files

Merge "Revert "btif: fix bond state callback state mismatch"" am: 984bdfe8 am: 9d116314 

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



Change-Id: If570e24eb07bcfbdc3836810f2872adb8a4c3e75
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 94585511 9d116314

system/btif/src/btif_dm.cc

+2 −4
Original line number Diff line number Diff line
@@ -1205,10 +1205,8 @@ static void btif_dm_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) { 
    }

    // Report bond state change to java only if we are bonding to a device or

    // a device is removed from the pairing list.

    if (pairing_cb.state == BT_BOND_STATE_BONDING) {

      bond_state_changed(status, bd_addr, BT_BOND_STATE_BONDING);

    } else if (is_bonded_device_removed) {

      bond_state_changed(status, bd_addr, BT_BOND_STATE_NONE);

    if (pairing_cb.state == BT_BOND_STATE_BONDING || is_bonded_device_removed) {

      bond_state_changed(status, bd_addr, state);

    }

  }

}