summaryrefslogtreecommitdiffstats
path: root/core/java/android/bluetooth
Commit message (Expand)AuthorAgeFilesLines
* Add support for MITM for BluetoothSockets (1/4)Casper Bonde2015-06-033-6/+90
* SAP: Change to use new SDP Api (4/4)Casper Bonde2015-06-031-0/+91
* Merge "Expose a few system APIs for BLE scan only mode." into mnc-devWei Wang2015-06-021-11/+15
|\
| * Expose a few system APIs for BLE scan only mode.Wei Wang2015-06-021-11/+15
* | Bluetooth: Fix to avoid framework reboot during monkey testingNitin Shivpure2015-06-021-6/+15
* | Un-hide connectGatt() variant with selective transportAndre Eisenbach2015-06-021-4/+0
|/
* setCallbackType should be public for onlost/onfound apisPrerepa Viswanadham2015-05-191-2/+0
* Bluetooth: Check for mPanService before changing tethering stateHemant Gupta2015-05-191-8/+14
* Do not report WiFi and Bluetooth MAC addresses - framework.Svet Ganov2015-05-181-0/+8
* Add bluetooth permission annotationsTor Norbye2015-05-156-1/+69
* Bluetooth native dumpsys logging support (3/5)Andre Eisenbach2015-05-121-2/+2
* Allow obtaining BLE capabilities in BLE scan only mode.Wei Wang2015-05-071-7/+4
* Merge changes from topic 'mwd-merge-050415' into mnc-devPrerepa Viswanadham2015-05-053-13/+7
|\
| * Merge commit 'eba66c3' into master_mergePrerepa Viswanadham2015-05-012-13/+4
| |\
| | * Make onlost/onfound APIs publicPrerepa Viswanadham2015-04-222-13/+4
| * | am 17004d63: am 342c22a5: am f2cfe6c0: Merge "Fix a bug in ScanSettings const...Wei Wang2015-05-011-1/+1
| |\ \
| * \ \ am c869bbfd: am 50b37f8c: am c90c7604: Merge "Honor Ble scanning settings fro...Wei Wang2015-05-012-22/+11
| |\ \ \
| * \ \ \ am 129a0b8b: am 94d7494a: am 56c58a2e: Merge "Fix typo. bug: b/20610710" into...tturney2015-05-011-1/+1
| |\ \ \ \
| * \ \ \ \ am fb63b682: am 46fa9a96: am 05a419ae: Merge "Temp workaround to track max be...Wei Wang2015-04-301-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge "Annotate some APIs with threading annotations"Tor Norbye2015-04-271-0/+3
| |\ \ \ \ \ \
| | * | | | | | Annotate some APIs with threading annotationsTor Norbye2015-04-231-0/+3
* | | | | | | | BluetoothSap class should not be publicAndre Eisenbach2015-05-042-6/+56
* | | | | | | | Add documentation for BluetoothSocket.getConnectionType()Andre Eisenbach2015-05-041-3/+7
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge "Fix a bug in ScanSettings constructor." into mnc-devWei Wang2015-05-011-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fix a bug in ScanSettings constructor.Wei Wang2015-05-011-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge "Honor Ble scanning settings from Settings UI." into mnc-devWei Wang2015-05-012-22/+11
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Honor Ble scanning settings from Settings UI.Wei Wang2015-04-302-22/+11
| |/ / / /
* | | | | Merge "Fix typo. bug: b/20610710" into mnc-devtturney2015-05-011-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix typo.tturney2015-04-291-1/+1
| |/ / /
* | | | Temp workaround to track max beacons.Wei Wang2015-04-301-1/+1
|/ / /
* | | Fix documentation - non-public API.Etan Cohen2015-04-241-3/+0
* | | Bluetooth document fix: remove reference from open API to hidden entitiesEtan Cohen2015-04-241-4/+1
* | | Merge commit 'db1dbb8' into merge2Etan Cohen2015-04-246-3/+22
|\ \ \ | | |/ | |/|
| * | Manage onfound/lost resources (1/2)Prerepa Viswanadham2015-04-216-3/+22
| * | Fix make update-apiYorke Lee2015-04-152-12/+0
| * | Add support for Bluetooth Sim Access Profile (2/4)Casper Bonde2015-04-157-4/+491
* | | Merge commit '6ddbb5e' into merge2Etan Cohen2015-04-241-0/+6
|\ \ \ | |/ /
| * | Bluetooth LE background operation mode (2/2)Nitin Arora2015-04-157-23/+355
* | | Reduce log spam in BluetoothAdapter for getState.Prerepa Viswanadham2015-04-231-1/+0
| |/ |/|
* | Fix make update-apiYorke Lee2015-04-152-12/+0
* | Add support for Bluetooth Sim Access Profile (2/4)Casper Bonde2015-04-157-4/+491
* | Bluetooth LE background operation mode (2/2)Nitin Arora2015-04-157-23/+355
* | am b5e0cfb..557d2f5 from mirror-m-wireless-internal-releaseVinit Deshpande2015-04-1411-32/+918
|\ \ | |/
| * Fix onLost/onFound logic in isSettingsAndFilterComboAllowedtturney2015-04-131-2/+2
| * OBEX Over L2CAP + SDP search API for BT profilesCasper Bonde2015-04-1110-30/+916
* | Merge "Merge commit 'e593d0a' into merge_work"Prerepa Viswanadham2015-04-126-9/+182
|\ \
| * \ Merge commit 'e593d0a' into merge_workPrerepa Viswanadham2015-04-106-9/+182
| |\ \ | | |/
| | * Onfound onlost feature.Prerepa Viswanadham2015-04-076-9/+182
* | | Fix a typo in BluetoothLeScanner documentationScott Kennedy2015-04-101-1/+1
|/ /
* | Merge commit 'd91f193' into merge2Etan Cohen2015-04-011-0/+34
|\ \ | |/