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

Commit 2035d239 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "GD SMP: Fix logic error in picking dialog type" am: 3238fc58 am:...

Merge "GD SMP: Fix logic error in picking dialog type" am: 3238fc58 am: 8b34796b am: c28d2464 am: f90f797e

Change-Id: Id9951fc62bd1e5b502b55473324d8d4487fc6994
parents b20666ba f90f797e
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ void btif_dm_init(uid_set_t* set) {
        //TODO: java BondStateMachine requires change into bonding state. If we ever send this event separately, consider removing this line
        HAL_CBACK(bt_hal_cbacks, bond_state_changed_cb, BT_STATUS_SUCCESS, &address, BT_BOND_STATE_BONDING);

        if(BT_SSP_VARIANT_PASSKEY_ENTRY) {
        if (pairing_variant == BT_SSP_VARIANT_PASSKEY_ENTRY) {
          // For passkey entry we must actually use pin request, due to BluetoothPairingController (in Settings)
          HAL_CBACK(bt_hal_cbacks, pin_request_cb, &address, &bd_name, cod, false);
          return;