summaryrefslogtreecommitdiffstats
path: root/core/java/android/bluetooth
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/
| * Add API for BLE_SCAN_ALWAYS_AVAILABLE feature.Wei Wang2015-03-271-0/+34
* | Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into m...Prerepa Viswanadham2015-03-241-1/+8
|\ \ | |/
| * Make Opportunistic Scan API public.Wei Wang2015-03-181-2/+0
| * Add opportunistic ble scan mode. (1/2)Wei Wang2015-03-171-1/+10
* | Change WiFi and Bluetooth ActivityEnergyInfo classesAdam Lesinski2015-03-091-9/+12
* | Remove unused imports in frameworks/base.John Spurlock2015-02-282-6/+0
* | am cd623416: am 8f31fa81: am 3ca77ccf: am 455502b7: Merge "Add API to check i...Andre Eisenbach2015-02-102-2/+34
|\ \
| * \ am 8f31fa81: am 3ca77ccf: am 455502b7: Merge "Add API to check if a Bluetooth...Andre Eisenbach2015-02-102-2/+34
| |\ \ | | |/
| | * Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lm...Andre Eisenbach2015-02-102-2/+34
| | |\
| | | * Add API to check if a Bluetooth connection is encrypted (1/2)Andre Eisenbach2015-02-092-2/+34
* | | | am a96869fc: am 24c02c41: am d67aff68: am a63ba428: Merge "Separate the prote...Matthew Xie2015-02-091-19/+23
|\ \ \ \ | |/ / /
| * | | am 24c02c41: am d67aff68: am a63ba428: Merge "Separate the protection of mPro...Matthew Xie2015-02-091-19/+23
| |\ \ \ | | |/ /
| | * | Separate the protection of mProxyServiceStateCallbacks from that of mServiceMatthew Xie2015-02-061-19/+23
| | |/
* | | Move mute/unmute handling to adjust volume pathsRoboErik2015-01-291-2/+10
* | | am 76552bb9: am e77adabe: Don\'t compute flags length for scan responsePrerepa Viswanadham2015-01-231-4/+4
|\ \ \ | |/ /
| * | am 76552bb9: am e77adabe: Don\'t compute flags length for scan responsePrerepa Viswanadham2015-01-231-4/+4
| |\ \ | | |/
| | * Don't compute flags length for scan responsePrerepa Viswanadham2015-01-231-4/+4
* | | am f6b62a9d: am cd460538: Merge "Don\'t send the onServiceDisconnected callba...Andre Eisenbach2014-12-161-6/+1
|\ \ \ | |/ /
| * | am f6b62a9d: am cd460538: Merge "Don\'t send the onServiceDisconnected callba...Andre Eisenbach2014-12-161-6/+1
| |\ \ | | |/
| | * Don't send the onServiceDisconnected callback after close.Benjamin Franz2014-12-161-6/+1
* | | am f60f29d0: am c9149984: Merge "Prevent NullPointerException in getStringVal...Andre Eisenbach2014-12-101-1/+1
|\ \ \ | |/ /
| * | am c9149984: Merge "Prevent NullPointerException in getStringValue if no valu...Andre Eisenbach2014-12-101-1/+1
| |\ \ | | |/
| | * Prevent NullPointerException in getStringValue if no value is setAndre Eisenbach2014-12-091-1/+1