summaryrefslogtreecommitdiffstats
path: root/core/java/android/bluetooth
Commit message (Expand)AuthorAgeFilesLines
* Merge "Bluetooth Health APIs"Jaikumar Ganesh2011-07-114-62/+104
|\
| * Bluetooth Health APIsJaikumar Ganesh2011-07-114-62/+104
* | Get server's listening channelBen Dodson2011-07-081-0/+10
* | Incoming Bluetooth Connection requests - dialog.Matthew Xie2011-07-078-12/+389
|/
* Implement APIs for Bluetooth Health profile.Jaikumar Ganesh2011-06-247-2/+699
* Refactor Bluetooth Profile.Jaikumar Ganesh2011-06-145-119/+228
* am 5aaed097: am 58ada2f3: am 94062517: Merge "Require bonding and encryption ...Jaikumar Ganesh2011-06-061-3/+63
|\
| * am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server"Jaikumar Ganesh2011-06-061-3/+63
| |\
| | * Require bonding and encryption for PBAP serverMathias Jeppsson2011-05-171-3/+63
* | | Bluetooth: correcting return value from cancelDiscoveryAlbert Mojir2011-06-021-1/+1
* | | Add public api BluetoothSocket.isConnected.Matthew Xie2011-05-231-12/+32
* | | am 37677849: am 64c42cae: Rename HierarchicalStateMachine and HierarchicalSta...Wink Saville2011-04-182-33/+33
|\ \ \ | |/ /
| * | am 64c42cae: Rename HierarchicalStateMachine and HierarchicalState to StateMa...Wink Saville2011-04-182-33/+33
| |\ \
| | * | Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.Wink Saville2011-04-182-33/+33
* | | | am f4a29403: resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aospRobert Greenwalt2011-04-071-0/+4
|\ \ \ \ | |/ / /
| * | | resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aospRobert Greenwalt2011-04-071-0/+4
| |\ \ \ | | |/ /
| | * | Add external dependency API.Robert Greenwalt2011-04-071-0/+4
* | | | Check if BT is disabled or not when sending audio state.Jaikumar Ganesh2011-04-061-2/+7
|/ / /
* | | am b8332786: am d973bed3: Merge "Removing dead store; it was likely a relict ...Brad Fitzpatrick2011-03-171-1/+0
|\ \ \ | |/ / |/| / | |/
| * Removing dead store; it was likely a relict of debuging code.Jozef BABJAK2011-03-171-1/+0
| * am 1c9761e3: Merge "Do Not Merge Connect other profiles when priority is auto...Jaikumar Ganesh2011-01-211-5/+9
| |\
| | * Do Not Merge Connect other profiles when priority is auto connect.Jaikumar Ganesh2011-01-211-5/+9
| * | am a788a943: Merge "Do Not Merge: Expose insecure rfcomm Bluetooth API." into...Jaikumar Ganesh2011-01-142-2/+107
| |\ \ | | |/
| | * Merge "Do Not Merge: Expose insecure rfcomm Bluetooth API." into gingerbreadJaikumar Ganesh2011-01-142-2/+107
| | |\
| | | * Do Not Merge: Expose insecure rfcomm Bluetooth API.Jaikumar Ganesh2011-01-142-2/+107
| * | | am c8f42fb6: Merge "DO NOT MERGE: Remove auto connection on ACL connection." ...Jaikumar Ganesh2011-01-121-4/+0
| |\ \ \ | | |/ /
| | * | DO NOT MERGE: Remove auto connection on ACL connection.Jaikumar Ganesh2011-01-121-4/+0
| | |/
| * | am 025f78eb: Merge "DO NOT MERGE Fix auto connection with headsets which don\...Jaikumar Ganesh2010-10-271-4/+85
| |\ \ | | |/
| | * DO NOT MERGE Fix auto connection with headsets which don't send incomingJaikumar Ganesh2010-10-271-4/+85
* | | Refactor android.server.BluetoothService classes.Jake Hamby2011-02-241-1/+0
* | | Make BluetoothPan inherit from BluetoothProfile.Jaikumar Ganesh2011-02-235-105/+206
* | | Make BluetoothInputDevice inherit from BluetoothProfile.Jaikumar Ganesh2011-02-226-166/+193
* | | am 25bbfda2: am 485d577a: Merge "Fix BluetoothAdapter Connection change inten...Jaikumar Ganesh2011-02-011-4/+4
|\ \ \
| * | | Fix BluetoothAdapter Connection change intent doc.Jaikumar Ganesh2011-02-011-4/+4
* | | | am d2b87091: am 0f2e2b8b: Merge "Update package descriptions with editorial r...Scott Main2011-01-261-2/+2
|\ \ \ \ | |/ / /
| * | | Update package descriptions with editorial revisions.Scott Main2011-01-261-2/+2
* | | | am 48f73779: am e9b644fc: Merge "Fix some unmatched javadoc tags." into honey...Jaikumar Ganesh2011-01-262-8/+8
|\ \ \ \ | |/ / /
| * | | Fix some unmatched javadoc tags.Jaikumar Ganesh2011-01-262-8/+8
* | | | Merge "Make the interface with DHCP IPv6 capable."Robert Greenwalt2011-01-261-15/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Make the interface with DHCP IPv6 capable.Robert Greenwalt2011-01-261-15/+4
* | | | Revert "Temporary Changes for certification of SCO."Jaikumar Ganesh2011-01-262-22/+0
* | | | Improve readability of java docs for the public APIs.Jaikumar Ganesh2011-01-254-47/+83
* | | | Rename virtual call API to ScoUsingVirtualCall.Jaikumar Ganesh2011-01-252-11/+15
|/ / /
* | | Merge "Connect other profiles when priority is auto connect." into honeycombJaikumar Ganesh2011-01-211-3/+7
|\ \ \
| * | | Connect other profiles when priority is auto connect.Jaikumar Ganesh2011-01-211-3/+7
* | | | Merge "Temporary Changes for certification of SCO." into honeycombJaikumar Ganesh2011-01-212-0/+22
|\ \ \ \ | |/ / /
| * | | Temporary Changes for certification of SCO.Jaikumar Ganesh2011-01-212-0/+22
* | | | docs: small javadoc, but also make the existing getProfileProxy docs visible....Scott Main2011-01-191-4/+5
|/ / /
* | | Make connection / disconnect failure more robust.Jaikumar Ganesh2011-01-192-0/+26
* | | Fix bug in handling connect/disconnect multiple devices.Jaikumar Ganesh2011-01-131-3/+3