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

Commit b5012786 authored by Ying Hsu's avatar Ying Hsu
Browse files

Revert "btif: fix bond state callback state mismatch" 

This reverts commit 31c671c7.

Reason for revert: b/262216943

Change-Id: I84b188637e0759958c351b5967bab9e2932cd841
Test: manual - pairing a classic keyboard with wrong key
parent 31c671c7

system/btif/src/btif_dm.cc

+2 −4
Original line number Diff line number Diff line
@@ -1176,10 +1176,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);

    }

  }

}