OSDN Git Service

GD SMP: Fix logic error in picking dialog type
authorJakub Pawlowski <jpawlowski@google.com>
Mon, 2 Mar 2020 13:00:20 +0000 (14:00 +0100)
committerJakub Pawlowski <jpawlowski@google.com>
Mon, 2 Mar 2020 13:03:39 +0000 (14:03 +0100)
Bug: 147086339
Change-Id: I0ccf793ec704370e6f0f36ebd8f8d73ed2941313

btif/src/btif_dm.cc

index f6d353d..d9a7950 100644 (file)
@@ -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;