diff -r 907b2fb7aa8e -r 4b81101308c6 bluetooth/btstack/linkmgr/physicallinks.cpp --- a/bluetooth/btstack/linkmgr/physicallinks.cpp Fri Apr 16 16:09:25 2010 +0300 +++ b/bluetooth/btstack/linkmgr/physicallinks.cpp Mon May 03 13:34:38 2010 +0300 @@ -818,7 +818,7 @@ if (!aEncrypted) { iLinksMan.LinkManagerProtocol().ACLController().SetParked(iHandle, ETrue); - iEncryptionEnforcer->EncryptionDisabled(SimplePairingMode()== EPhySimplePairingEnabled); + iEncryptionEnforcer->EncryptionDisabled(IsEncryptionPauseResumeSupported()); } else { @@ -4162,12 +4162,12 @@ } } -void CEncryptionEnforcer::EncryptionDisabled(TBool aSecurityModeFour) +void CEncryptionEnforcer::EncryptionDisabled(TBool aEncryptionPauseResumeSupported) { LOG_FUNC LOG1(_L("CEncryptionEnforcer::EncryptionDisabled() : current status = %d"), iState); - if(aSecurityModeFour) + if(aEncryptionPauseResumeSupported) { Stop(); ChangeState(EForcingInProgress);