summaryrefslogtreecommitdiffstats
path: root/stack/btm/btm_sec.c
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r20' into HEADJessica Wagantall2016-04-051-44/+2
|\
| * DO NOT MERGE Remove Porsche car-kit pairing workaroundAndre Eisenbach2016-02-261-44/+2
* | Bluetooth: Handled smp over BR/EDR for temp pairingvenkata Jagadeesh2015-10-151-2/+2
* | Merge "Bluetooth: Add retry mechanism for CC and RNR failure of pairing"Linux Build Service Account2015-10-151-0/+68
|\ \
| * | Bluetooth: Add retry mechanism for CC and RNR failure of pairingSrinu Jella2015-10-121-0/+68
* | | Bluetooth: Remove bond if encryption fails due to missing keyNitin Arora2015-10-071-6/+6
|/ /
* | Bluetooth: Don't process pair request when controller is not readySrinu Jella2015-10-061-1/+5
* | Bluetooth: Handled pairing state change in collision scenariovenkata Jagadeesh2015-10-061-0/+1
* | Bluetooth: Handling Authentication Failure From the lower layerMatadeen Mishra2015-10-061-1/+1
* | Bluetooth: Add null check for reference data to avoid exceptionSrinu Jella2015-10-061-4/+13
* | Bluedroid BT: Fixed Static Analysis IssuesMatadeen Mishra2015-10-061-0/+2
* | Bluetooth: Do not go for inquiry in BONDING Statevenkata Jagadeesh2015-10-061-2/+17
* | GAP: Save pin code len for incoming legacy SAP connectionvenkata Jagadeesh2015-10-061-1/+1
* | Bluetooth: GAP: Serialize the commands during Pairing processSrinu Jella2015-10-061-7/+2
* | BT: Fixed Static Analysis IssuesMatadeen Mishra2015-10-061-3/+4
* | Bluetooth: Changes for key upgrade at auth failureNitin Arora2015-10-061-3/+7
* | Bluetooth: Skip LE key derivation if BR key is temporaryNitin Arora2015-10-061-1/+8
* | Bluetooth: LE-L2CAP-COC on M.Balraj Selvaraj2015-10-061-9/+315
* | Bluetooth:GAP:Ignore pairing not allowed err when pairing in progressSrinu Jella2015-10-061-1/+0
* | Bluetooth: GAP: To include bdt test tool in system imageAjay Kumar2015-10-061-1/+5
|/
* Fix a NULL-pointer crashPavlin Radoslavov2015-07-291-1/+2
* Reset LE encryption key size at LE disconnection onlyNitin Arora2015-07-291-1/+1
* Set the security mode to secure connections only modeSrinu Jella2015-06-231-0/+1
* Reset the pairing state on pairing failureSrinu Jella2015-06-231-0/+8
* Handle connection request to already connected device.Srinu Jella2015-06-231-2/+7
* SAP: Make it possible to enforce a 16-digit pin code (1/5)Casper Bonde2015-06-091-16/+134
* Reset pairing state to idle only for the current deviceSrinu Jella2015-06-021-1/+3
* Handle pairing timeout during remote name requestSrinu Jella2015-05-281-0/+1
* Pairing is prompted with a wrong bd-addressSatya Calloji2015-05-221-1/+1
* Static address is seen on scanner after unpairingSatya Calloji2015-05-201-0/+17
* DO NOT MERGE Fix compilation on platforms with BLE_INCLUDED == FALSEAndre Eisenbach2015-05-141-6/+8
* Cross transport key mapping fixesChaojing Sun2015-04-271-31/+60
* am f29a2fb..e07ad10 from mirror-m-wireless-internal-releaseVinit Deshpande2015-04-141-229/+943
|\
| * BR/EDR secure connections supportMudumba Ananth2015-04-131-108/+473
| * LE Privacy 1.2 and LE secure connectionsSatya Calloji2015-04-131-134/+483
* | Merge commit 'f7f839985b3931682363d2ef3b7c5cae55a842ee' into mergeEtan Cohen2015-03-311-532/+40
|\|
| * Demote, cleanup and extend observed loggingChris Manton2015-03-161-29/+26
| * Remove GKI timersSharvil Nanavati2015-03-161-3/+3
| * Collapse RFCOMM_INCLUDED and GAP_INCLUDED guards.Sharvil Nanavati2015-03-161-2/+0
| * Clean up unused functions in btm_secZach Johnson2015-03-161-347/+0
| * Remove unused security abort callbackZach Johnson2015-03-161-3/+0
| * Remove link key request callbackZach Johnson2015-03-161-14/+0
| * Add platform-independent logging macros to OSI.Sharvil Nanavati2015-03-161-0/+3
| * Move controller module to device directoryChris Manton2015-03-161-1/+1
| * Remove always true BTM_BUSY_LEVEL_CHANGE_INCLUDEDChris Manton2015-03-161-2/+0
| * Refactor btm_devctl reset sequenceZach Johnson2015-03-161-15/+8
| * Remove <BT 2.0 workaroundsZach Johnson2015-03-161-3/+0
| * Prune BTM_SetSecurityMode and GAP_SetSecurityModeZach Johnson2015-03-161-71/+0
| * Remove some < BT 2.1 code & repeated initZach Johnson2015-03-161-17/+3
| * Remove unused function BTM_SecSetConnectFilterCallbackZach Johnson2015-03-161-31/+0