aboutsummaryrefslogtreecommitdiff
path: root/framework/java/android/bluetooth/BluetoothAdapter.java
Commit message (Collapse)AuthorAgeFilesLines
...
* | Add status callback for start/stop advertising.Wei Wang2014-03-181-68/+115
| | | | | | | | | | | | Fixes b/13289050, b/13418851, also fixes 13418671. Change-Id: I231ba51aaa67b1f917e476ef0f2c8f82c762df77
* | BLE peripheral mode (3/4): Add peripheral mode API.Wei Wang2013-12-191-10/+199
| | | | | | | | | | | | | | | | Change-Id: Id9d2f566b6d9ed0fffe73b67efad2e3d045360b4 Conflicts: core/java/android/bluetooth/BluetoothAdapter.java core/java/android/bluetooth/BluetoothGatt.java
* | Remove unused imports from frameworks/base.John Spurlock2013-11-201-4/+0
|/ | | | Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
* Revert "Allow L2CAP sockets"Mike Lockwood2013-10-021-36/+0
| | | | This reverts commit 008ce9e07b5e58c5ab31c5d73ec3d1ad1a6cf605.
* Fixed review commentsKim Schulz2013-09-121-2/+8
| | | | | | | | | | | - fixed review comments (internal+google) - corrected tabs/spaces - Add connection id header for obex client operations - added support for implementing ProfileService class Change-Id: Idab8b4fa54a0f31bec4ffa263a69a9850a07f858 Bug:10692365
* Allow L2CAP socketsDmitry Grinberg2013-09-061-0/+36
| | | | Change-Id: Icb498e6c0430789b6168bec3beb1d4650e4f1238
* LE: Add peripheral role support (1/4)Andre Eisenbach2013-08-141-0/+4
| | | | | | Initial stack support for the LE peripheral role. Change-Id: I6222493488822b4289b90888ccc97ad9306f54d1
* LE: Add instance ID to descriptors (1/4)Andre Eisenbach2013-08-131-3/+3
| | | | | | | If a remote devices offers multiple descriptors with the same UUID, the instance ID is used to differentiate between them. Change-Id: I0c36494c980c86abd23f9647196af8d59ef663e9
* Merge "Add debug menu to enable btsnoop"Zhihai Xu2013-07-261-0/+19
|\
| * Add debug menu to enable btsnoopZhihai Xu2013-06-171-0/+19
| | | | | | | | | | bug: 8059358 Change-Id: I2d5f13e68defefb92e0b11b749fe77ad67215f36
* | Explicit locale when formatting machine strings.Jeff Sharkey2013-06-111-1/+2
|/ | | | | Bug: 9390451 Change-Id: I3581c53407554a1dffd541fb42b06d68f20a7be0
* Update javadoc to give app write better guidenceMatthew Xie2013-05-301-3/+8
| | | | | | | | Update javadoc of close methods of GATT cliet and server Update javadoc of BluetoothAdapter bug 8963528 Change-Id: I45ec618fd495225ed11a6171f33bfdc218397d4c
* Donot bind to GATT service when BLE is not supportedMatthew Xie2013-05-081-1/+5
| | | | | | bug 8664724 Change-Id: I9b9222cd5877babcded73798a5d1ff13fd10e791
* Change permission of LE scan APIs from BLUETOOTH to BLUETOOTH_ADMINMatthew Xie2013-04-241-3/+3
| | | | | | bug 8667898 Change-Id: Iaff19fe72b16a96a6cf2f5b9140e369098567d2b
* Remove BluetoothAdapterCallback. Simplify leScan ApiMatthew Xie2013-04-171-165/+257
| | | | | | | App does not need to explicitly register/unregister callback bug 8599881 Change-Id: I18cfef14d7ddb344722945e657dcb959823b412b
* Unhide Bluetooth Low Energy public APIsMatthew Xie2013-03-281-8/+230
| | | | | | | | | | Updated API headers. Add BluetoothManager to be retrieved by context.getSystemService(Context.BLUETOOTH_SERVICE). LE scan functions are placed in BluetoothAdapter The GATT API are device driven instead of a profile-driver. bug 8450158 Change-Id: I424a4cedaac3ef8120a05996500008dd210d2553
* Fix docs bug.Stephen Hines2013-02-281-2/+1
| | | | Change-Id: I8c69963b339d703757bf1cd8f43161175783566d
* Initial version of BLE support for BluedroidGanesh Ganapathi Batta2013-02-271-2/+17
| | | | | | The API classes are hidden for now. Will unhide after API console approval. Change-Id: I8283dd562fd6189fdd15c866ef2efb8bbdbc4109
* Clean up debug messagesMatthew Xie2012-11-291-2/+2
| | | | | | bug 7626174 Change-Id: I65cdcaf2c48a78468b6cef0b8591289435068b24
* Turn off verbose debug message in BluetoothAdapterMatthew Xie2012-08-291-1/+2
| | | | Change-Id: I30245ab911b5428f7af38f195b941db02d36b18f
* Implement enableNoAutoconnect()Ganesh Ganapathi Batta2012-08-141-3/+12
| | | | | | | Adding enableNoAutoconnect() API support in Bluetooth service to let BT enable in quiet mode Change-Id: I546f3ceb298082a9c9a698f406379470e3cc0d4f
* Bluetooth: fix enableNoAutoConnect() call.Martijn Coenen2012-08-031-4/+2
| | | | | | For now, just do a regular connect. Change-Id: Ibc43098d45c82177298cb17d72a32c7904924021
* Moved BluetoothAdapter.ACTION_STATE_CHANGED broadcast from AdapterService to ↵fredc2012-07-161-8/+11
| | | | | | BluetoothManagerService Change-Id: I88e5f3fe050cf11eae9c5cf1b7c393a178b8f9b1
* Fixed socket not closing on BT off. Used RemoteCallbackList to monitor ↵fredc2012-07-161-4/+14
| | | | | | binder deaths in BluetoothManagerService. Change-Id: I524964bd2836d8c5a4bae095b93ac9481337941d
* Fixed issue with Settings app crashing after during on/off and unpair.fredc2012-07-161-7/+24
| | | | | | Fixed issue with BluetoothAdapter.getRemoteDevice() returning null. Change-Id: Ie86813532530a6b57bde1c430c7b4875ecc7354c
* Fixed issue with getting Bluetooth adapter's name and airplane modefredc2012-07-161-1/+1
| | | | Change-Id: I18b632223574aa41b09ba30de8e35417fad86cbe
* Change done in BluetoothAdapter to use the same API for interacting with the ↵Sreenidhi T2012-07-161-1/+1
| | | | | | Bluetooth Service. setName was being done using mService while getName was using mManagerService. As a result, the device name was not being updated in Localadapter getname call. Modified to use mService in both cases. Change-Id: I2e900a782df11fd511319fbb42d94324e50ae89b
* BT enable adapter API should return TRUE or FALSE.Kausik Sinnaswamy2012-07-161-4/+1
| | | | Change-Id: Iaef14c51d3407b69505c55a0bbdaf902213402cf
* Non persistent adapter servicefredc2012-07-161-30/+117
| | | | | | | | | | | | | | | | | | Change-Id: Ib13d5c77416e58161df0e04d7a15ec0dddbde8b5 Conflicts: core/java/android/bluetooth/BluetoothInputDevice.java Conflicts: core/java/com/android/internal/app/ShutdownThread.java services/java/com/android/server/SystemServer.java Conflicts: services/java/com/android/server/SystemServer.java services/java/com/android/server/pm/ShutdownThread.java
* Fix discoverability timeout issues. (a) implement timeout logic (b) persist ↵Srikanth Uppala2012-07-161-1/+2
| | | | | | 'never timeout' after reboot (c) code cleanup Change-Id: Iacaec4a48a45935a49576c140ea11ea3d0da6361
* Added new rfcomm multi accept codezzy2012-07-161-122/+27
|
* Add a new version of the disable API.Jaikumar Ganesh2012-07-161-1/+18
| | | | | | | | | This allows for the setting to be persisted or not. Also turn on Bluetooth in System Server if needed. It won't work currently because the service wouldn't have started. Change-Id: I15fa2bff93aa32134c1b565fcbe90ba68614b6a1
* Changes for new Bluetooth APIs.Jaikumar Ganesh2012-07-131-20/+25
| | | | | | | Changes to Bluetooth Adapter, Device and IBluetooth interfaces for new Bluetooth APIs. Delete AudioGateway. Change-Id: Ib51b31187eafde261441b9311b5e7e13c8bff82f
* Allow enabling Bluetooth without auto-connecting.Martijn Coenen2012-04-231-0/+12
| | | | | | | | | | | This is a feature used for NFC-to-Bluetooth handover: we want to enable BT for file transfer, and disconnect it when we're done. During this period we don't want to auto-connect other devices - it should be transparent to the user that Bluetooth is used. Also, don't allow A2DP/HSP incoming connections. Change-Id: I0a03e8084c439b1271b6a80f4d9da5aacfe19c45
* am 49183f61: am bb7f590a: Merge "docs: Add developer guide cross-references, ↵Joe Fernandez2011-12-221-0/+6
|\ | | | | | | | | | | | | Project ACRE, round 4" into ics-mr1 * commit '49183f61dfd970d4b059f19f1282376a9cb07224': docs: Add developer guide cross-references, Project ACRE, round 4
| * docs: Add developer guide cross-references, Project ACRE, round 4Joe Fernandez2011-12-221-0/+6
| | | | | | | | Change-Id: I1b43414aaec8ea217b39a0d780c80a25409d0991
* | Add BluetoothAdapter.getRemoteDevice(byte[])Nick Pelly2011-12-091-1/+20
|/ | | | | | This is useful for NFC->BT hand-over, where we are already working with bytes. Change-Id: I2fff0b4fa0cefe9bfdf9a13f7ec6f557776a8a03
* Cleanup references when turning BT off.Jaikumar Ganesh2011-11-281-4/+22
| | | | | Bug: 5572649 Change-Id: I62f9e0620832b69995d5c6e1c24634c9a3895a4b
* Check the bluetooth state for getUuid callMatthew Xie2011-11-161-0/+1
| | | | | | | | | Donnot make the bluetoothservice.getUuids call if the bluetooth is not on. Also get rid of all the necessary locks on BluetoothService for get property call. It had a lock on BluetoothAdapterProperty. bug5472114 Change-Id: I383472ae6006fc1f0129c960c8a44ed0df027a43
* docs: mix of BT and NFC javadoc updatesScott Main2011-09-271-5/+5
| | | | | | | Add Health profile to various discussions about profiles Add descriptions to NFC interfaces, tweak some desciptions, and fix some broken links Change-Id: Ib89434c78a4ad60b4358dca9a6c335451d1c4125
* Move Bluetooth remove service record handler to the app main threadMatthew Xie2011-08-291-12/+19
| | | | | | | | | | | | Move Bluetooth remove service record handler to the app main thread. This removes the dependency of caller thread that constructs the BluetoothAdapter singleton instance. The caller thread could stop while BluetoothAdapter singleton exists but lose the handler context. Make the BluetoothService.removeServiceRecord return quickly without blocking on native call. bug 4999443 Change-Id: I302534baa381f4aca8192e1e4a9ea21793b07ba6
* Make profile connection state API public.Jaikumar Ganesh2011-08-231-8/+9
| | | | Change-Id: I1f2810d4e820142435f7bbda051c98ec3e3cf3eb
* Add Api to get profile connection state.Jaikumar Ganesh2011-08-221-0/+25
| | | | | | | This gets the current connection state of the profile with respect to the local Bluetooth adapter. Change-Id: I7cff6c9201d29a8b45413cff7384b7483f21bd5c
* Enforce permission for changeApplicationState function.Jaikumar Ganesh2011-08-031-1/+4
| | | | | | | The ADMIN permission is for use cases where we want to manage BT connection at a deeper level. So just the Bluetooth permission is good enough here. Change-Id: Iddd038fe9f9a26f155b4edc9484ba1fe27b178ba
* Add ability to turn BT on / off on a per application basis.Jaikumar Ganesh2011-07-261-0/+63
| | | | | | | | | | This changes adds an API for system applications to enable bluetooth without all the side effects like auto connection to headsets etc. Also some tweaks to the adapter state machine Change-Id: Ib9f22d548a26d72334b300101c8eb0d80f08a4bb
* Implement APIs for Bluetooth Health profile.Jaikumar Ganesh2011-06-241-0/+3
| | | | | | | This first patch implements all the APIs. The APIs wil be made public soon. The data specification API will be submited in another patchset. Change-Id: I2462683b7e07380e2c42474b0036b34d03b4bed1
* am dd636176: am 58ada2f3: am 94062517: Merge "Require bonding and encryption ↵Jaikumar Ganesh2011-06-061-3/+63
|\ | | | | | | | | | | | | for PBAP server" * commit 'dd636176738d17e0fbaa10d833c7e64c3e484531': Require bonding and encryption for PBAP server
| * am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server"Jaikumar Ganesh2011-06-061-3/+63
| |\ | | | | | | | | | | | | * commit '58ada2f3bbab749fb5a813fb8f82eee347080405': Require bonding and encryption for PBAP server
| | * Require bonding and encryption for PBAP serverMathias Jeppsson2011-05-171-3/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | The Phonebook Access Profile specification requires bonding and encryption. For devices not supporting SSP (Secure Simple Pairing), InsecureRfcomm will require neither. Adding EncryptedRfcomm to force bonding and encryption but not requiring authenticated link key. Change-Id: If47cca9c5ffd89358bcd61d64f7785d17e0ca7cc
| | * Do Not Merge: Expose insecure rfcomm Bluetooth API.Jaikumar Ganesh2011-01-141-1/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This complements the secure rfcomm API. The link key is unauthenticated and is subject to MITM attacks. The link key may be encrypted depending on the type of Bluetooth device. This helps apps which don't need the extra security or have their own security layer built on top of the rfcomm link. Bug: 3352266 Change-Id: I633fd0372e5e23288d6fec950dd1abc2896031f1