--- a/bluetooth/btstack/secman/btaccessrequester.cpp Mon Mar 15 12:44:59 2010 +0200
+++ b/bluetooth/btstack/secman/btaccessrequester.cpp Wed Mar 31 23:19:43 2010 +0300
@@ -696,18 +696,20 @@
else if(aResult == EBTSecManAccessGranted)
{
LOG(_L8("\tACCESS GRANTED"));
- if (RemoteIndicatedNoBondingToDedicatedBonding())
- {
- // We allow the device to bond, but tell theUI layer so it can delete the link key if it wants to
- aResult = KErrRemoteDeviceIndicatedNoBonding;
- LOG(_L8("\t... but remote indicated no bonding"));
- }
}
else
{
LOG1(_L8("\tERROR (%d)"), aResult);
}
#endif // __FLOG_ACTIVE
+
+ if (aResult == EBTSecManAccessGranted && RemoteIndicatedNoBondingToDedicatedBonding())
+ {
+ // We allow the device to bond, but tell theUI layer so it can delete the link key if it wants to
+ aResult = KErrRemoteDeviceIndicatedNoBonding;
+ LOG(_L8("\t... but remote indicated no bonding"));
+ }
+
iSecMan.AccessRequestComplete(this, aResult);
}