OSDN Git Service
(root)
/
android-x86
/
system-bt.git
/ search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
resolved conflicts for ae0d983d to mnc-dr-dev-plus-aosp
2015-08-27
Nitin Arora
am 8ebc2f2c: (-s ours) am b7460434: Fix memory corruption...
commit
|
commitdiff
|
tree
2015-08-27
Nitin Arora
am 18e678b4: (-s ours) am d63f7c0b: Add Dialog mouse...
commit
|
commitdiff
|
tree
2015-08-27
Nitin Arora
am fd07ffb9: (-s ours) am 82c8b927: Reset LE encryption...
commit
|
commitdiff
|
tree
2015-08-27
Nitin Arora
am fd735526: (-s ours) am ac72840a: Update device type...
commit
|
commitdiff
|
tree
2015-08-27
Nitin Arora
am 0dea8f20: (-s ours) am 1da48a36: Use pseudo address...
commit
|
commitdiff
|
tree
2015-08-27
Nitin Arora
am 51a5f0fe: (-s ours) am b4365c55: Adding transport...
commit
|
commitdiff
|
tree
2015-08-27
Nitin Arora
am 835c43db: (-s ours) am ccd37fa0: Enable enhanced...
commit
|
commitdiff
|
tree
2015-08-27
Nitin Arora
am d85275da: (-s ours) am f0e9c466: Add Moto Key Link...
commit
|
commitdiff
|
tree
2015-08-27
Nitin Arora
am 0a1f787d: (-s ours) am ac1399a7: Use correct own...
commit
|
commitdiff
|
tree
2015-08-27
Nitin Arora
am 2378ca29: (-s ours) am 26c3dd41: Fail LE secure...
commit
|
commitdiff
|
tree
2015-08-27
Nitin Arora
am 289bfeae: (-s ours) am 4f6c9b4f: Use correct transport...
commit
|
commitdiff
|
tree
2015-08-25
Nitin Arora
am 3a464232: am ee8592f4: am b7460434: Fix memory corruption...
commit
|
commitdiff
|
tree
2015-08-25
Nitin Arora
am ee8592f4: am b7460434: Fix memory corruption of...
commit
|
commitdiff
|
tree
2015-08-25
Nitin Arora
am b7460434: Fix memory corruption of BLE whitelist...
commit
|
commitdiff
|
tree
2015-08-25
Nitin Arora
am b7460434: Fix memory corruption of BLE whitelist...
commit
|
commitdiff
|
tree
2015-08-25
Nitin Arora
Fix memory corruption of BLE whitelist hashmap
commit
|
commitdiff
|
tree
2015-08-04
Nitin Arora
am c41e90bd: am 68a34519: am d63f7c0b: Add Dialog mouse...
commit
|
commitdiff
|
tree
2015-08-04
Nitin Arora
am 68a34519: am d63f7c0b: Add Dialog mouse & KB to...
commit
|
commitdiff
|
tree
2015-08-04
Nitin Arora
am d63f7c0b: Add Dialog mouse & KB to blacklist for...
commit
|
commitdiff
|
tree
2015-08-04
Nitin Arora
am d63f7c0b: Add Dialog mouse & KB to blacklist for...
commit
|
commitdiff
|
tree
2015-08-04
Nitin Arora
Add Dialog mouse & KB to blacklist for LE secure connections
commit
|
commitdiff
|
tree
2015-07-29
Nitin Arora
am 7ffb0f1a: am dbb1ad17: am 82c8b927: Reset LE encryption...
commit
|
commitdiff
|
tree
2015-07-29
Nitin Arora
am dbb1ad17: am 82c8b927: Reset LE encryption key size...
commit
|
commitdiff
|
tree
2015-07-29
Nitin Arora
am 82c8b927: Reset LE encryption key size at LE disconnectio...
commit
|
commitdiff
|
tree
2015-07-29
Nitin Arora
am 82c8b927: Reset LE encryption key size at LE disconnectio...
commit
|
commitdiff
|
tree
2015-07-29
Nitin Arora
Reset LE encryption key size at LE disconnection only
commit
|
commitdiff
|
tree
2015-07-23
Nitin Arora
am e61ad8de: am 8cc6e42e: am ac72840a: Update device...
commit
|
commitdiff
|
tree
2015-07-23
Nitin Arora
am 8cc6e42e: am ac72840a: Update device type correctly...
commit
|
commitdiff
|
tree
2015-07-22
Nitin Arora
am ac72840a: Update device type correctly in the NVRAM...
commit
|
commitdiff
|
tree
2015-07-22
Nitin Arora
am ac72840a: Update device type correctly in the NVRAM...
commit
|
commitdiff
|
tree
2015-07-22
Nitin Arora
Update device type correctly in the NVRAM at inquiry...
commit
|
commitdiff
|
tree
2015-07-21
Nitin Arora
am 2a7d33cd: am 1da48a36: Use pseudo address while...
commit
|
commitdiff
|
tree
2015-07-21
Nitin Arora
am dd9e79b8: am b4365c55: Adding transport type while...
commit
|
commitdiff
|
tree
2015-07-21
Nitin Arora
am 1eeb7ae0: am ccd37fa0: Enable enhanced connection...
commit
|
commitdiff
|
tree
2015-07-21
Nitin Arora
am 1da48a36: Use pseudo address while re-pairing peripheral
commit
|
commitdiff
|
tree
2015-07-21
Nitin Arora
am b4365c55: Adding transport type while initiating...
commit
|
commitdiff
|
tree
2015-07-21
Nitin Arora
am 1da48a36: Use pseudo address while re-pairing peripheral
commit
|
commitdiff
|
tree
2015-07-21
Nitin Arora
am ccd37fa0: Enable enhanced connection complete event
commit
|
commitdiff
|
tree
2015-07-21
Nitin Arora
am b4365c55: Adding transport type while initiating...
commit
|
commitdiff
|
tree
2015-07-21
Nitin Arora
Use pseudo address while re-pairing peripheral
commit
|
commitdiff
|
tree
2015-07-21
Nitin Arora
Adding transport type while initiating remote discovery
commit
|
commitdiff
|
tree
2015-07-21
Nitin Arora
am ccd37fa0: Enable enhanced connection complete event
commit
|
commitdiff
|
tree
2015-07-21
Nitin Arora
Enable enhanced connection complete event
commit
|
commitdiff
|
tree
2015-07-17
Nitin Arora
am 66439e94: am f0e9c466: Add Moto Key Link to blacklist...
commit
|
commitdiff
|
tree
2015-07-17
Nitin Arora
am f0e9c466: Add Moto Key Link to blacklist for LE...
commit
|
commitdiff
|
tree
2015-07-17
Nitin Arora
am f0e9c466: Add Moto Key Link to blacklist for LE...
commit
|
commitdiff
|
tree
2015-07-17
Nitin Arora
Add Moto Key Link to blacklist for LE secure connections
commit
|
commitdiff
|
tree
2015-07-15
Nitin Arora
am ac1399a7: Use correct own address type for batch...
commit
|
commitdiff
|
tree
2015-07-15
Nitin Arora
am ac1399a7: Use correct own address type for batch...
commit
|
commitdiff
|
tree
2015-07-15
Nitin Arora
Use correct own address type for batch scan
commit
|
commitdiff
|
tree
2015-07-10
Nitin Arora
am 26c3dd41: Fail LE secure pairing for secure only...
commit
|
commitdiff
|
tree
2015-07-10
Nitin Arora
am 26c3dd41: Fail LE secure pairing for secure only...
commit
|
commitdiff
|
tree
2015-07-10
Nitin Arora
Fail LE secure pairing for secure only peripherals
commit
|
commitdiff
|
tree
2015-07-06
Nitin Arora
am 4f6c9b4f: Use correct transport type while encrypting...
commit
|
commitdiff
|
tree
2015-07-06
Nitin Arora
am 4f6c9b4f: Use correct transport type while encrypting...
commit
|
commitdiff
|
tree
2015-07-06
Nitin Arora
Use correct transport type while encrypting link
commit
|
commitdiff
|
tree
2015-07-06
Nitin Arora
Prevent LE remote name request during inquiry
commit
|
commitdiff
|
tree
2015-06-24
Nitin Arora
am ea8292ea: SMP state machine fix for passkey entry
commit
|
commitdiff
|
tree
2015-06-24
Nitin Arora
am 11e6c293: Configure Bluetooth Low Energy scan parameters...
commit
|
commitdiff
|
tree
2015-06-23
Nitin Arora
SMP state machine fix for passkey entry
commit
|
commitdiff
|
tree
2015-06-23
Nitin Arora
Configure Bluetooth Low Energy scan parameters correctly
commit
|
commitdiff
|
tree
2015-06-17
Nitin Arora
am 90dcc56c: Disconnect Gatt during failure of service...
commit
|
commitdiff
|
tree
2015-06-17
Nitin Arora
Disconnect Gatt during failure of service changed discovery...
commit
|
commitdiff
|
tree
2015-06-17
Nitin Arora
am 00ba745e: Use correct UUID for Central Address Resolution...
commit
|
commitdiff
|
tree
2015-06-17
Nitin Arora
Use correct UUID for Central Address Resolution characteristic
commit
|
commitdiff
|
tree
2015-06-10
Nitin Arora
am 4c0e671b: Recitfy condition when removing device...
commit
|
commitdiff
|
tree
2015-06-10
Nitin Arora
am 089651a3: Fix allocation for LE scan filter parameters
commit
|
commitdiff
|
tree
2015-06-10
Nitin Arora
am 19e91b0f: (-s ours) Fix for premature BLE RPA timeout
commit
|
commitdiff
|
tree
2015-06-10
Nitin Arora
am 7557b674: Use correct structure to read LE connection...
commit
|
commitdiff
|
tree
2015-06-08
Nitin Arora
Recitfy condition when removing device from IRK resolving...
commit
|
commitdiff
|
tree
2015-06-08
Nitin Arora
Fix allocation for LE scan filter parameters
commit
|
commitdiff
|
tree
2015-06-08
Nitin Arora
Fix for premature BLE RPA timeout
commit
|
commitdiff
|
tree
2015-06-08
Nitin Arora
Use correct structure to read LE connection handle
commit
|
commitdiff
|
tree
2015-05-22
Nitin Arora
am 04b5e929: Recitfy condition when removing device...
commit
|
commitdiff
|
tree
2015-05-22
Nitin Arora
Recitfy condition when removing device from IRK resolving...
commit
|
commitdiff
|
tree
2015-05-20
Nitin Arora
am 643aea51: Fix allocation for LE scan filter parameters
commit
|
commitdiff
|
tree
2015-05-20
Nitin Arora
am ecce764b: Fix for premature BLE RPA timeout
commit
|
commitdiff
|
tree
2015-05-20
Nitin Arora
am 6e872cb5: Use correct structure to read LE connection...
commit
|
commitdiff
|
tree
2015-05-20
Nitin Arora
Fix allocation for LE scan filter parameters
commit
|
commitdiff
|
tree
2015-05-20
Nitin Arora
Fix for premature BLE RPA timeout
commit
|
commitdiff
|
tree
2015-05-20
Nitin Arora
Use correct structure to read LE connection handle
commit
|
commitdiff
|
tree
2015-05-07
Nitin Arora
Increases number of LE multi-advertiser instances supported
commit
|
commitdiff
|
tree
2015-05-07
Nitin Arora
Fix allocation of instance ID for LE services
commit
|
commitdiff
|
tree
2015-05-01
Nitin Arora
Stop media task alarm when task is exiting
commit
|
commitdiff
|
tree
2015-04-03
Nitin Arora
Prevent slave link block removal at cancel connect
commit
|
commitdiff
|
tree
2015-04-02
Nitin Arora
Include log library to make bdtool
commit
|
commitdiff
|
tree
2015-04-02
Nitin Arora
Using generic format specifier for logging pointers
commit
|
commitdiff
|
tree
2015-03-30
Nitin Arora
Include log library to make bdtool
commit
|
commitdiff
|
tree
2015-03-30
Nitin Arora
Using generic format specifier for logging pointers
commit
|
commitdiff
|
tree
2015-03-27
Nitin Arora
Fix macro for maximum allowed HOGP devices
commit
|
commitdiff
|
tree
2015-03-25
Nitin Arora
Rectify allocation of GATT control block
commit
|
commitdiff
|
tree
2015-03-24
Nitin Arora
Allow dual-mode devices to be processed by BR/EDR scan
commit
|
commitdiff
|
tree
2015-03-24
Nitin Arora
Delete 0 index LE scan filter at inquiry cancel
commit
|
commitdiff
|
tree
2015-03-24
Nitin Arora
Ignore LE security request if BR/EDR pairing is ongoing
commit
|
commitdiff
|
tree
2015-03-23
Nitin Arora
Reset LE connecting flag on disconnect only if BDA...
commit
|
commitdiff
|
tree
2015-03-23
Nitin Arora
Send GATT discovery complete only if discovery is active
commit
|
commitdiff
|
tree
2014-09-23
Nitin Arora
Remove HOGP device from background connection list
commit
|
commitdiff
|
tree
2014-08-15
Nitin Arora
Remove IRK entry from controller when LE device is...
commit
|
commitdiff
|
tree
2014-07-11
Nitin Arora
am 02d9b7b4: Bluetooth: Increase number of allowed...
commit
|
commitdiff
|
tree
2014-07-11
Nitin Arora
am 7475a509: Bluetooth: Adds SMP response timer for...
commit
|
commitdiff
|
tree
next