summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix call to enable(bool) which changed as part ofstable/cm-13.0-ZNH2KBJessica Wagantall2016-07-084-4/+4
* DO NOT MERGE btif: check overflow on create_pbuf sizeMarie Janssen2016-07-081-1/+8
* Add guest mode functionality (2/3)Ajay Panicker2016-07-089-13/+100
* btif: Don't persist remote devices to the configMarie Janssen2016-06-075-34/+69
* Merge remote-tracking branch 'github/cm-13.0' into HEADJessica Wagantall2016-05-169-35/+179
|\
| * Merge tag 'android-6.0.1_r43' into HEADJessica Wagantall2016-05-031-1/+1
| |\
| | * DO NOT MERGE Check size of pin before replyingMarie Janssen2016-03-251-1/+1
| * | BT-HFP: Add HFP 1.7 features only if supported by peerJean-Bernard Damiano2016-04-281-30/+9
| * | Add Renault MediaNav to HFP 1.7 blacklistjmozmoz2016-04-261-1/+3
| * | add medianav to unsupported device for hfp 1.7Jean-Bernard Damiano2016-04-241-1/+3
| * | Merge tag 'android-6.0.1_r30' into HEADJessica Wagantall2016-04-196-9/+157
| |\|
| | * DO NOT SUBMIT Revert "DO NOT MERGE Blacklist devices for absolute volume cont...Akshay Thakker2016-03-164-27/+7
| | * DO NOT MERGE Blacklist devices for absolute volume controlAndre Eisenbach2016-03-014-7/+27
| | * DO NOT MERGE Remove Porsche car-kit pairing workaroundAndre Eisenbach2016-02-263-53/+2
| | * DO NOT MERGE Add ability to add interop entries dynamically (2/2)Andre Eisenbach2016-02-246-11/+139
| * | bt-vendor: Fix sporadic crashes on shutdownRicardo Cerqueira2016-04-151-1/+5
| * | Merge branch 'LA.BF.1.1.3_rb1.12' of git://codeaurora.org/platform/system/bt ...Steve Kondik2016-04-071-0/+7
| |\ \
| | * \ Merge AU_LINUX_ANDROID_LA.BF.1.1.3_RB1.06.00.01.181.012 on remote branchLinux Build Service Account2016-04-040-0/+0
| | |\ \
| | * \ \ Merge "BT: ACL and l2c out if sync after connection collision"Linux Build Service Account2016-03-161-0/+7
| | |\ \ \
| | | * | | BT: ACL and l2c out if sync after connection collisionGurpreet Ghai2016-03-101-0/+7
| * | | | | Merge tag 'android-6.0.1_r24' into HEADJessica Wagantall2016-04-053-53/+2
| |\ \ \ \ \
| * | | | | | Bluetooth: Allow REMOVE_EAGER_THREADS to be unsetIvan Grinko2016-04-051-0/+6
* | | | | | | DO NOT MERGE Check size of pin before replyingMarie Janssen2016-05-031-1/+1
* | | | | | | bt-vendor: Fix sporadic crashes on shutdownRicardo Cerqueira2016-04-151-1/+5
* | | | | | | Merge tag 'android-6.0.1_r24' into HEADJessica Wagantall2016-04-053-53/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | merge in mnc-dr1.5-release history after reset to mnc-dr1.5-devThe Android Automerger2016-03-220-0/+0
| |\ \ \ \ \
| | * \ \ \ \ merge in mnc-dr1.5-release history after reset to mnc-dr1.5-devThe Android Automerger2016-03-170-0/+0
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | DO NOT MERGE Remove Porsche car-kit pairing workaroundAndre Eisenbach2016-03-013-53/+2
| |/ / / / /
* | | | | | Merge branch 'LA.BF.1.1.3_rb1.11' of git://codeaurora.org/platform/system/bt ...Steve Kondik2016-03-3023-52/+500
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge AU_LINUX_ANDROID_LA.BF.1.1.3_RB1.06.00.01.181.010 on remote branchLinux Build Service Account2016-03-070-0/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Merge AU_LINUX_ANDROID_LA.BF.1.1.3_RB1.06.00.01.181.009 on remote branchLinux Build Service Account2016-02-140-0/+0
| | |\ \ \ \
| | | * \ \ \ Merge AU_LINUX_ANDROID_LA.BF.1.1.3_RB1.06.00.01.181.008 on remote branchLinux Build Service Account2016-01-220-0/+0
| | | |\ \ \ \
| * | | \ \ \ \ Merge "Bluetooth: Synchronizing access to hashmap in counter module"Linux Build Service Account2016-03-051-0/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Bluetooth: Synchronizing access to hashmap in counter moduleGurpreet Ghai2016-02-181-0/+2
| | |/ / / / / /
| * | | | | | | Merge "Bluetooth: GAP: Setting remove device pending status as FALSE"Linux Build Service Account2016-02-261-0/+32
| |\ \ \ \ \ \ \
| | * | | | | | | Bluetooth: GAP: Setting remove device pending status as FALSEBalraj Selvaraj2016-02-111-0/+32
| * | | | | | | | Merge "Bluetooth: Clean up l2cap socket properly on closure"Linux Build Service Account2016-02-261-0/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Bluetooth: Clean up l2cap socket properly on closureSrinu Jella2016-02-231-0/+5
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge "Bluetooth: Enforce BT state check during GATT operations."Linux Build Service Account2016-02-261-2/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Bluetooth: Enforce BT state check during GATT operations.Pradeep Panigrahi2016-02-021-2/+4
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge "Bluetooth: GAP: Update Paging and inquiry busy level seperately"Linux Build Service Account2016-02-262-10/+14
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Bluetooth: GAP: Update Paging and inquiry busy level seperatelySrinu Jella2016-01-172-10/+14
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge "Stops all BLE timers when BT turn off request is issued to BT stack"Linux Build Service Account2016-02-261-5/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Stops all BLE timers when BT turn off request is issued to BT stackSubramanian Srinivasan2016-02-181-5/+5
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge "Increase number of semaphores for media workqueue"Linux Build Service Account2016-02-261-1/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Increase number of semaphores for media workqueueAyan Ghosh2016-02-181-1/+2
| | |/ / / / / / /
| * | | | | | | | Merge "Bluetooth: Offload config save functionality to btif thread"Linux Build Service Account2016-02-261-4/+10
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Bluetooth: Offload config save functionality to btif threadSrinu Jella2016-02-161-4/+10
| * | | | | | | | | Merge "Fix crashes with lots of discovered LE devices"Linux Build Service Account2016-02-261-43/+42
| |\| | | | | | | |
| | * | | | | | | | Fix crashes with lots of discovered LE devicesMarie Janssen2016-02-161-43/+42
| | |/ / / / / / /