summaryrefslogtreecommitdiffstats
path: root/core/java/android/bluetooth
Commit message (Expand)AuthorAgeFilesLines
* am 54499194: am 2e8a2d20: Merge "LE: Return false if an attribute read/write ...Zhihai Xu2014-04-101-0/+60
|\
| * LE: Return false if an attribute read/write is in progressAndre Eisenbach2014-04-091-0/+60
* | am 7d394df2: am ae1b763c: Merge "LE: Add API to configure MTU for a given con...Zhihai Xu2014-03-315-0/+72
|\ \ | |/
| * Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-mo...Zhihai Xu2014-03-315-0/+72
| |\
| | * LE: Add API to configure MTU for a given connection (3/4)Andre Eisenbach2014-03-255-0/+72
* | | am 1b09c97d: am 4447405d: Merge "Callback on correct method when status is un...Wei Wang2014-03-291-2/+14
|\ \ \ | |/ /
| * | Callback on correct method when status is unsuccessful.Wei Wang2014-03-291-2/+14
* | | am 0d68a52a: am 9d3e0996: Merge "Add comment of using same callback for start...Wei Wang2014-03-281-1/+1
|\ \ \ | |/ /
| * | Add comment of using same callback for start/stop advertising.Wei Wang2014-03-271-1/+1
| |/
| * am 13bd8577: am c0384b6b: DO NOT MERGE: Move advetise clean up to callback co...Wei Wang2014-03-201-5/+21
| |\
| | * am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/1...Wei Wang2014-03-201-5/+21
| | |\
| | | * DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050Wei Wang2014-03-191-5/+21
| * | | am 15a18d07: am da084104: Merge "DO NOT MERGE: Add status callback for start...Wei Wang2014-03-204-69/+131
| |\ \ \ | | |/ /
| | * | am da084104: Merge "DO NOT MERGE: Add status callback for start/stop adverti...Wei Wang2014-03-204-69/+131
| | |\ \ | | | |/
| | | * DO NOT MERGE: Add status callback for start/stop advertising.Wei Wang2014-03-204-69/+131
| | * | am 1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mo...Wei Wang2014-03-088-93/+394
| | |\ \ | | | |/
| | | * DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.Wei Wang2014-03-068-93/+394
* | | | Get rid of not specifying a user errors in bluetooth.Dianne Hackborn2014-03-207-9/+15
* | | | Move advetise clean up to callback code. fixes b/13289050Wei Wang2014-03-201-5/+21
* | | | Add status callback for start/stop advertising.Wei Wang2014-03-184-71/+131
* | | | am 5adbea2e: am 784224d2: am b8a7dd63: Merge "Add handshake broadcast support...Mike J. Chen2014-03-071-1/+13
|\ \ \ \ | |/ / /
| * | | Add handshake broadcast supportMike J. Chen2014-03-041-1/+13
* | | | am 1ece04f3: Merge "BluetoothInputJava: Add broadcast action REPORT" into klp...Mike J. Chen2014-01-281-0/+6
|\ \ \ \ | |/ / /
| * | | BluetoothInputJava: Add broadcast action REPORTMike J. Chen2014-01-271-0/+6
* | | | am bfa3f4fd: Merge "BluetoothInputDevice: make REPORT_TYPE values match hal" ...Mike J. Chen2014-01-281-3/+3
|\ \ \ \ | |/ / /
| * | | BluetoothInputDevice: make REPORT_TYPE values match halMike J. Chen2014-01-271-3/+3
| * | | BLE peripheral mode (3/4): Add peripheral mode API.Wei Wang2014-01-138-93/+394
| * | | NPE in BluetoothSocket.write()Zhihai Xu2014-01-131-13/+14
| |/ /
* | | bluetoothsocket fd leak, need close the file descriptor after detachFd.Zhihai Xu2014-01-201-2/+4
* | | Merge "NPE in BluetoothDevice.fetchUuidsWithSdp"Zhihai Xu2014-01-141-1/+6
|\ \ \
| * | | NPE in BluetoothDevice.fetchUuidsWithSdpZhihai Xu2014-01-131-1/+6
* | | | Merge "NPE in BluetoothSocket.write()"Zhihai Xu2014-01-041-13/+14
|\ \ \ \
| * | | | NPE in BluetoothSocket.write()Zhihai Xu2013-12-171-13/+14
| |/ / /
* | | | BLE peripheral mode (3/4): Add peripheral mode API.Wei Wang2013-12-198-92/+394
* | | | am 9c514b8f: am 4561f199: am 08e0142f: am f85470e6: am fbbc1b79: Merge "Doc u...Katie McCormick2013-12-131-7/+9
|\ \ \ \ | | |/ / | |/| |
| * | | Doc update: Update package summary for BT.Katie McCormick2013-12-121-7/+9
| | |/ | |/|
* | | Remove unused imports from frameworks/base.John Spurlock2013-11-2014-46/+0
| |/ |/|
* | am 46cfa691: am 9a53fbe4: am ce39e8ce: Merge "Change pairing api/intent permi...Matthew Xie2013-10-211-6/+6
|\ \ | |/
| * Change pairing api/intent permission from PRIVILEGED to ADMINMatthew Xie2013-10-211-6/+6
* | Remove captive portal code that has no effect.Narayan Kamath2013-10-161-5/+0
|/
* Merge "Check callback null condition for register/unregsiter state change cal...Matthew Xie2013-10-107-18/+27
|\
| * Check callback null condition for register/unregsiter state change callbackMatthew Xie2013-10-107-18/+27
* | Makes ACTION_PAIRING_REQUEST require BLUETOOTH_PRIVILEGED.Edward Jee2013-10-101-1/+2
|/
* Revert "Allow L2CAP sockets"Mike Lockwood2013-10-023-66/+1
* Unhide setPin, setPin, setPairingConfirmation, and relevant intent fieldsMatthew Xie2013-09-291-14/+42
* Fixed review commentsKim Schulz2013-09-124-73/+198
* Allow L2CAP socketsDmitry Grinberg2013-09-063-1/+66
* Merge "Block ble adv api based on resource config" into klp-devMatthew Xie2013-09-031-0/+8
|\
| * Block ble adv api based on resource configMatthew Xie2013-08-281-0/+8
* | Fix docs build.Ying Wang2013-08-261-2/+2