aboutsummaryrefslogtreecommitdiff
path: root/framework/java/android/bluetooth/BluetoothAdapter.java
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fix make update-apiYorke Lee2015-04-151-6/+0
| | | | | | | | Change-Id: Iaee002c64096fbd6ba05d6484cc50840146a4af0
| * Add support for Bluetooth Sim Access Profile (2/4)Casper Bonde2015-04-151-0/+7
| | | | | | | | Change-Id: I6c634aa38d31a7b5a98c9089840557257fd58209
* | Merge commit '5e8cdc7' into merge2Etan Cohen2015-04-241-0/+6
|\|
| * Bluetooth LE background operation mode (2/2)Nitin Arora2015-04-151-8/+304
| | | | | | | | | | | | | | | | Changes include new framework APIs to enable and disable Bluetooth LE separately from Bluetooth Classic. Along with handling the new states in the Bluetooth manager service. Change-Id: Idf667981f48fcbcb6dfda1aa77ea8bab1b2361f0
* | Reduce log spam in BluetoothAdapter for getState.Prerepa Viswanadham2015-04-231-1/+0
| | | | | | | | Change-Id: I38995fc55f12b000d58a769ed67aff623865169b
* | Fix make update-apiYorke Lee2015-04-151-6/+0
| | | | | | | | Change-Id: Iaee002c64096fbd6ba05d6484cc50840146a4af0
* | Add support for Bluetooth Sim Access Profile (2/4)Casper Bonde2015-04-151-0/+7
| | | | | | | | Change-Id: I6c634aa38d31a7b5a98c9089840557257fd58209
* | Bluetooth LE background operation mode (2/2)Nitin Arora2015-04-151-8/+304
| | | | | | | | | | | | | | | | Changes include new framework APIs to enable and disable Bluetooth LE separately from Bluetooth Classic. Along with handling the new states in the Bluetooth manager service. Change-Id: Idf667981f48fcbcb6dfda1aa77ea8bab1b2361f0
* | am b5e0cfb..557d2f5 from mirror-m-wireless-internal-releaseVinit Deshpande2015-04-141-1/+47
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 557d2f5 Merge "Add ConnectivityManager.reportNetworkConnectivity() API" into m-wireless-dev 9653e27 Fix onLost/onFound logic in isSettingsAndFilterComboAllowed bfd17b7 Add ConnectivityManager.reportNetworkConnectivity() API c0a7c93 OBEX Over L2CAP + SDP search API for BT profiles 31a94f4 Add ConnectivityManager.getActiveNetwork(). Rework NetID allocation in ConnectivityService so registerNetworkAgent() can return the allocated NetID. bf18bed Merge "Non-functional code cleanup of ConnectivityService." into m-wireless-dev db8784e Merge "Cleanup of Video Call pause functionality." into m-wireless-dev e75b9e3 Non-functional code cleanup of ConnectivityService. 98d25c5 Onfound onlost feature. 0326f58 Merge "API for config app." into m-wireless-dev e9b056f API for config app. d5351e7 RTT framework interface update 582b868 Unhide Network.openConnection(URL, Proxy). 0d719ca Fix typos in ConnectivityManager documentation. Change-Id: Ib4c88f6d7ad1b24227b032555c62a5804194384b
| * OBEX Over L2CAP + SDP search API for BT profilesCasper Bonde2015-04-111-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Updated OBEX to support SRM - Added support for OBEX over l2cap and SRM. - Minor bugfixes, and reduce CPU load ALOT - Added support to send responses without body data. - Extend BluetoothSocket to support L2CAP - Added functionality to get the channel number needed to be able to create an SDP record with the channel number. - Added interface to get socket type and max packet sizes. - Added interface to perform SDP search and get the resulting SDP record data. Change-Id: I9d37a00ce73dfffc0e3ce03eab5511ba3a86e5b8
* | Merge commit '98d25c5' into merge_workPrerepa Viswanadham2015-04-101-0/+18
|\| | | | | | | Change-Id: I4f8ae40fc446cd9cda4d5c6ec99469a98dda595b
| * Onfound onlost feature.Prerepa Viswanadham2015-04-071-0/+18
| | | | | | | | | | Change-Id: I5475cb21183abab8cf04af486ff7692396801b92 Signed-off-by: Prerepa Viswanadham <dham@google.com>
* | Merge commit '43c66e2' into merge2Etan Cohen2015-04-011-0/+34
|\|
| * Add API for BLE_SCAN_ALWAYS_AVAILABLE feature.Wei Wang2015-03-271-0/+34
| | | | | | | | Change-Id: I83e966d4db076db367ded71bfb50c39e57568156
* | Remove unused imports in frameworks/base.John Spurlock2015-02-281-3/+0
|/ | | | Change-Id: I031443de83f93eb57a98863001826671b18f3b17
* Separate the protection of mProxyServiceStateCallbacks from that of mServiceMatthew Xie2015-02-061-19/+23
| | | | | | | The overuse of mManagerCallback caused a deaklock. Bug: 19264190 Change-Id: Iff20019ff0c99bb5f36435feb15e43e280a8e102
* Fix crash during Bluetooth on/off stress testAndre Eisenbach2014-10-291-1/+1
| | | | | Bug: 18106938 Change-Id: Icdeb736d89d5926264f2043455ccbc3760fd5d29
* am 1afd3f4e: Update javadoc comments for getBluetoothLeAdvertiser()Prerepa Viswanadham2014-10-161-2/+3
|\ | | | | | | | | * commit '1afd3f4e1a3abdceeb9faa38f8445063612897ff': Update javadoc comments for getBluetoothLeAdvertiser()
| * Update javadoc comments for getBluetoothLeAdvertiser()Prerepa Viswanadham2014-10-161-2/+3
| | | | | | | | | | | | | | To clarify that BluetoothLeAdvertiser object will return null when BT is off OR if the hw doesn't support these capabilities bug: 18006072 Change-Id: I635d7971711a3cae7c58f7a0636faf9a03f19970
* | Add support of advertising through standard instance.(1/4)Wei Wang2014-10-091-1/+17
|/ | | | | | | Use config overlay to check whether peripheral mode is supported. Bug: 17552672 Change-Id: I1081bc84da9fe033426f82ece2ec74c2d663e3aa
* Clean up advertise and scan clients upon bluetooth down.Wei Wang2014-08-131-0/+3
| | | | | | | | | | | Fixes b/16528460 This allows Advertiser and Scanner to be reused after bluetooth recycle, which follows same behavior for BluetoothAdapter. Also prints manufacturer data array for ScanRecord. Change-Id: I78bca40ac294433782a054bf2a00a775dac02d96
* Use Scanner for legacy LE scans(1/2).Wei Wang2014-07-241-273/+91
| | | | | | | Also removed different scan methods from IBluetoothGatt and make BluetoothLeScanner and BluetoothLEAdvertiser singleton. Change-Id: Ifa2e950b50f100f5507a6dace3bd70db18d7f9ca
* cleanup : delete BLE advertising related hidden state references in ↵Prerepa Viswanadham2014-07-241-18/+0
| | | | | | Bluetooth Adapter Change-Id: Ia58a46392157e274f8fc4696e8e25af480eb2d2a
* Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reportingPrerepa Viswanadham2014-07-231-0/+43
| | | | Change-Id: I66fd83d8d59fbd93dec8886dfd313a81575e38a5
* Remove MR2 BLE Advertising hidden API from L codebase (1/2).Wei Wang2014-07-141-246/+7
| | | | Change-Id: I78bb8b89de56bddb7422da1d1d4468c88a68ea11
* Unhide Bluetooth batch APIs. Deprecate BluetoothAdpater scan APIs. (1/2)Wei Wang2014-07-111-0/+10
| | | | Change-Id: Ib0c4ea6c8372a15473269660355fb5ccf4284457
* Unhide the Bluetooth(BLE) offload capability apisPrerepa Viswanadham2014-07-091-3/+0
| | | | Change-Id: Ice3f4f5ff4b8318bf6afe7021b253fe9ea4661d3
* OnFound and Onlost callback integrationPrerepa Viswanadham2014-07-091-0/+6
| | | | Change-Id: I23473b18484f041c4dd808c85bb92545a77e20c2
* Implement batch scan APIWei Wang2014-07-081-14/+9
| | | | Change-Id: Ibb527280a221fbdd0fc6b805a7527c29079294b4
* Obtain capabilities from chipset for it's support of various featuresPrerepa Viswanadham2014-07-021-0/+48
| | | | Change-Id: I01bdb31136be63e4e46fb4e054c902eddc5647ab
* LE: Add notification sent and congestion callbacks (3/4)Andre Eisenbach2014-06-271-4/+7
| | | | | | | | | | | | | | | | | | | This change introduces two new callbacks for applications to better handle LE notification flow control and transport congestion. The notification callback is invoked when the remote platform confirms an indication or when a local notification has been passed to the controller. No new notifications should be sent until a callback is received. Congestion callbacks are triggered when a GATT operation cannot be sent to the local Bluetooth controller. Repeatedly calling writeCharacteristic() for example will eventually trigger a congestion callback. Applications cannot send additional data until a further callback is received, indicating that the congestion has cleared up. Also made server callbacks "oneway" in the AIDL definition file. Change-Id: I7fa3324712205c79efce58e5e3df8b80a265a442
* BluetoothAvrcpController: Move AVRCP controller support to new ↵Mike Lockwood2014-06-131-0/+7
| | | | | | BluetoothProfile subclass Change-Id: Id988040a7ce623ed68e0349920301ff48db1fbce
* BluetoothA2dpSink: Add new BluetoothProfile subclass for A2DP sinkMike Lockwood2014-06-131-0/+7
| | | | Change-Id: I09d5cb8fdaea4c4828f333949b7c18deffd22722
* Rename BluetoothHandsfreeClient to BluetoothHeadsetClientMike Lockwood2014-06-131-5/+5
| | | | | | | | This makes our terminology consistent with the existing BluetoothHeadset profile Also updated arguments to Context.bindService() Change-Id: I27cc5a6fde256b1f5dccca53a7a15ec8f58691c2
* Bluetooth: Add support for HFP Client role.Hemant Gupta2014-06-131-1/+8
| | | | | | | Implementation changes in frameworks to support HFP Client role. Change-Id: Ifb10527cd6c1301297cae4f923b20734af672034
* Address API review comments.Wei Wang2014-05-291-0/+2
| | | | | | | | | | | | | | | | 1. Moved le stuff to it's subpackage. Remove BluetoothLe for all classes except *Scanner, *ScanSetting, *Advertiser and *AdvertiseSettings. 2. Make all callbacks abstract classes instead of interfaces. 3. Moved AdvertisementData and ScanRecord out and removed AdvertiseBaseData 4. Removed newBuild and use new Builder for all builders. 5. Using setxxx in builders. 6. Misc other changes. Fixes b/15140940 Change-Id: I32ae3d24a9491baf96048040b5ac78f6f731e468 NO_SQ: multi-project submit
* Revert "Revert "APIs for BLE scan, scan filter, batch scan, onFound/onLost ↵Wei Wang2014-05-191-0/+32
| | | | | | | | and multiple advertising."" This reverts commit b1d9fbc0f8dea0c77ed810190b325bfdaaf21789. Change-Id: Ic8dec9385a7c763170ebeb1bcddd221c72f46e88
* Revert "APIs for BLE scan, scan filter, batch scan, onFound/onLost and ↵Wei Wang2014-05-201-32/+0
| | | | | | | | multiple advertising." This reverts commit 2c4e68a86b7a9b9f760a8907b93ff40ccad56c80. Change-Id: I98c91343d886ebe22d0bf75a710fa0b0abf738b6
* APIs for BLE scan, scan filter, batch scan, onFound/onLost and multipleWei Wang2014-05-191-0/+32
| | | | | | advertising. Change-Id: I1655eb9cffa890b6fe38108bf51078662e90bc03
* am 7d394df2: am a93dbc3d: Merge "LE: Add API to configure MTU for a given ↵Zhihai Xu2014-03-311-0/+8
|\ | | | | | | | | | | | | connection (3/4)" into klp-modular-dev * commit '7d394df2ab8f951215a775df8d2bd9e6518e746a': LE: Add API to configure MTU for a given connection (3/4)
| * Merge "LE: Add API to configure MTU for a given connection (3/4)" into ↵Zhihai Xu2014-03-311-0/+8
| |\ | | | | | | | | | klp-modular-dev
| | * LE: Add API to configure MTU for a given connection (3/4)Andre Eisenbach2014-03-251-0/+8
| | | | | | | | | | | | | | | bug:13571470 Change-Id: I3619617eaf864701a35f7802bc71805784d768d0
* | | am 1b09c97d: am 4447405d: Merge "Callback on correct method when status is ↵Wei Wang2014-03-291-2/+14
|\| | | | | | | | | | | | | | | | | | | | unsuccessful." into klp-modular-dev * commit '1b09c97d8a7156a9f35ebab3c98db7b103852a58': Callback on correct method when status is unsuccessful.
| * | Callback on correct method when status is unsuccessful.Wei Wang2014-03-291-2/+14
| | | | | | | | | | | | Change-Id: I63c07bbae559765af1aecb492379ab18268336d8
* | | am 0d68a52a: am 9d3e0996: Merge "Add comment of using same callback for ↵Wei Wang2014-03-281-1/+1
|\| | | | | | | | | | | | | | | | | | | | start/stop advertising." into klp-modular-dev * commit '0d68a52ad32bb2c07314721b19e7973df6045d34': Add comment of using same callback for start/stop advertising.
| * | Add comment of using same callback for start/stop advertising.Wei Wang2014-03-271-1/+1
| |/ | | | | | | Change-Id: Ice268e83e4f2ceb5053a0e03f73b877f548bd13b
| * DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050Wei Wang2014-03-191-5/+21
| | | | | | | | | | | | Cherrypick from master to fix b/13289050 Change-Id: Ibf3c772561125821817c947730cf21defafd4cb2
| * DO NOT MERGE: Add status callback for start/stop advertising.Wei Wang2014-03-201-68/+115
| | | | | | | | | | | | | | | | | | Cherrypick from master to fix b/13289050 Change-Id: I231ba51aaa67b1f917e476ef0f2c8f82c762df77 Conflicts: core/java/android/bluetooth/BluetoothAdapter.java core/java/android/bluetooth/BluetoothGatt.java
| * DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.Wei Wang2014-03-061-11/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add bluetooth adv data, APIs in BluetoothAdpater etc. Cherry picking ble advertising changes from master to KLP MR2. b/13137996 Change-Id: Id9d2f566b6d9ed0fffe73b67efad2e3d045360b4 Conflicts: core/java/android/bluetooth/BluetoothAdapter.java core/java/android/bluetooth/BluetoothGatt.java Conflicts: core/java/android/bluetooth/BluetoothAdapter.java
* | Move advetise clean up to callback code. fixes b/13289050Wei Wang2014-03-201-5/+21
| | | | | | Change-Id: Ibf3c772561125821817c947730cf21defafd4cb2