From: Jakub Pawlowski <jpawlowski@google.com>
Date: Mon, 2 Mar 2020 13:00:20 +0000 (+0100)
Subject: GD SMP: Fix logic error in picking dialog type
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=59f1f0a54ee841c34192545dd53a040caa0cbd7d;p=android-x86%2Fsystem-bt.git

GD SMP: Fix logic error in picking dialog type

Bug: 147086339
Change-Id: I0ccf793ec704370e6f0f36ebd8f8d73ed2941313
---

diff --git a/btif/src/btif_dm.cc b/btif/src/btif_dm.cc
index f6d353dd3..d9a7950dd 100644
--- a/btif/src/btif_dm.cc
+++ b/btif/src/btif_dm.cc
@@ -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;