summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-090-0/+0
|\
| * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-050-0/+0
| |\
| | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-030-0/+0
| | |\
| | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-300-0/+0
| | | |\
| | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-290-0/+0
| | | | |\
| | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-280-0/+0
| | | | | |\
| | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-270-0/+0
| | | | | | |\
| | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-230-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-220-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-210-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-160-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * Add HCI Multi-Channel Transport support (1/2)YK Jeffrey Chao2012-08-1510-136/+1991
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise BT Vendor Lib interface and add support of HCI multi-channel transport. Change-Id: I5a7a7b64798bb30be60ed29bd564bc499bd5b5bc
* | | | | | | | | | | | audio: audio device API 2.0Eric Laurent2012-09-071-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove obsolete get_supported_devices() function. Change-Id: I4e2e6daa2222b9c7b6c685d8ac0763dc5f8cdaa9
* | | | | | | | | | | | Fixed acl credit issue when host data flow control is n/azzy2012-09-061-0/+1
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 7009277
* | | | | | | | | | | Fix for Fixed pin keyboard blacklist search issue.Ganesh Ganapathi Batta2012-09-041-15/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:7074362 Change-Id: I76afb73e51e8f6ab1da8257ea004c8d7131e6884
* | | | | | | | | | | Send proper length while retrieving local name during BT EnableGanesh Ganapathi Batta2012-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7093571 Change-Id: I328b0a24ffa827a5a7d22f90ee8d476bd151675e
* | | | | | | | | | | Fix for overlapping bt_target & gki_target definesKausik Sinnaswamy2012-09-042-95/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A few GKI buffer macro definitions were overlapping between bt_target and gki_target. GKI buffer definitions should only be present in gki_target.h. Change-Id: I0930960efe114ad479a894785b3ecf3e94195caf
* | | | | | | | | | | Handle all auth failure codes to retry pairingRavi Nagarajan2012-09-041-0/+6
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default stack will attempt to auto-pair with devices that match a certain COD. If pairing fails, pairing will be retried with manual user pin entry. The retry was limited to HCI error code 0x05 (auth failure). Expanded this list to handle more error conditions bug 7092121 Change-Id: I7c11d03b87350af597062cf77a296e340a929ef9
* | | | | | | | | | Add log tag for stack logsRavi Nagarajan2012-08-311-12/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use layer specific data to display the log tags for stack logs bug 7070825 Change-Id: I39b9a5c7c719a08bd5355c1648effc7828eceb57
* | | | | | | | | | audio: fix get_parameters()Eric Laurent2012-08-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix two bugs in adev_get_parameters(): - the str_parms struct was not destroyed causing a memory leak. - get_parameters() should return an empty string, not NULL. Change-Id: Icdf2803afe82fa4be7950b4659f850b772381f17
* | | | | | | | | | Enhanced log traces to print h/w error codeKausik Sinnaswamy2012-08-301-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prints the error code of hardware failure for the BR/EDR Controller Change-Id: I8c5172d9485ef0d71668969789fdacd720a2067f
* | | | | | | | | Fixed the issue that local adapter name cannot be changed and lost last ↵zzy2012-08-292-19/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bonded device 2 Root case: the adapter name property set/get with wrong section & key; The end condition of the loop to load bonded device is wrong removed the wrong return value check when loading blacklist Change-Id: Ib02d472311cd872befd17e6d2445f649f53f02fb
* | | | | | | | | Merge "fixed the issue that remote unpaired device not removed from config ↵Matthew Xie2012-08-291-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file" into jb-mr1-dev
| * | | | | | | | | fixed the issue that remote unpaired device not removed from config filezzy2012-08-291-0/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | root cause: forgot to remove the device from storage when bound is canceled Bug 7077419
* | | | | | | | | Turn on NUMLOCK states for HID KBs without NUMLOCKSyed Ibrahim M2012-08-292-8/+208
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set NUMLOCK state for HID keyboards without NUMLOCK key to be ON so that the numeric keypad can be used. Change-Id: Ib9811d55cc62ba380c0418f0ac9ff3827b9a3c8a
* | | | | | | | Log DM eventsRavi Nagarajan2012-08-283-1/+35
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add strings for DM event Change-Id: I800780c181dd51cbf9bb037690ad167a5f8bf363
* | | | | | | Added new storage code and bluez configuration migration supportzzy2012-08-2714-848/+2147
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter out hid device from bluez migration. Change-Id: I8b5eb29f37ca37e97b728f69063266a1b0a61eb8 Conflicts: main/Android.mk
* | | | | | Null terminate Local name before sending to stackGanesh Ganapathi Batta2012-08-251-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that Local name string is always Null terminated when sending it to BT stack from BTIF layer Bug:7027639 Change-Id: I319642d6073d4178bd34ca82431c4bda16270474
* | | | | | Remove hardcoded trace level settings in stack modules.YK Jeffrey Chao2012-08-243-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BTM, BTU, and BTA modules were preset with hardcoded trace level (BT_TRACE_LEVEL_DEBUG) during early development days. Since the trace levels have been made configurable in /etc/bluetooth/bt_stack.conf at run-time, removing those hardcoded settings. So, the compile-time default trace level BT_TRACE_LEVEL_WARNING (set in bt_trace.h) will be used if the bt_stack.conf is missing, or if the TraceConf=false is given in the bt_stack.conf. Change-Id: I76d905adbfda3c40f714398da86ebec90a1a8a40
* | | | | | Delay the role switch after the connection with devices that are blacklisted ↵Ganesh Ganapathi Batta2012-08-242-5/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for immediate role switch Initiating immediate role switch with certain remote devices has caused issues due to role switch colliding with link encryption setup and causing encryption (and in turn the link) to fail . These device Firmware versions are stored in a blacklist and role switch with these devices are delayed to avoid the collision with link encryption setup Bug 6992300 Change-Id: I71c7d94bc4cf03f2383b6c1956bba8697f6c2a8b
* | | | | | Ignore AVRCP Pause command from carkits right after the callGanesh Ganapathi Batta2012-08-241-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Certain carkits (e.g Audi MMI 2801)send AVRCP Pause command right after the call if there was an active music streaming when the call was answered. This command needs to be ignored as Phone/MediaPlayer will take care of music Play/pause after the call based on the state of the streaming before the call Change-Id: Iddb50089bff0f54bc3ad9665f95e64d3083c568a
* | | | | | Remove mako device configuration file. It's obsolete.Matthew Xie2012-08-231-171/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id9df79ff6c0f5e6a981ecb9defd82e057c643bf5
* | | | | | Do not send Bond state change evt after SDP completion if security upgrade ↵Ganesh Ganapathi Batta2012-08-231-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is in progress In mid of security upgrade, sending BOND_STATUS_BONDED to java dismisses Pairing confirmation dialog and results in security upgrade failure. Change-Id: If2a3858c6811eaa243f1c67d055862a634ccbb45
* | | | | | Remove attr_mask field from BTA_HH_ADD_DEV_EVT cbSyed Ibrahim M2012-08-233-5/+0
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove attr_mask field from bta_hh_api.c and bta_hh_act.c for BTA_HH_ADD_DEV_EVT callback as stack updates the attribute mask to the stack callout function bta_hh_co_open() Change-Id: I1e450a210a63359c7ae30551fd3c468f0e109fda
* | | | | Set thread names for debuggingRavi Nagarajan2012-08-222-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set thread names for easier debugging Change-Id: I1beeaae24a7782ab97be22db57060c773721bc46
* | | | | Minimized Bluetooth data traces (including L2CAP)Kausik Sinnaswamy2012-08-222-22/+22
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Configured the trace level to not report logs which are marked DEBUG or VERBOSE. Change-Id: I3112128d20140b28523edf439a1b6bd0c255d835
* | | | fixed the second reconnect issueSen-Der Huang2012-08-211-39/+48
|/ / / | | | | | | | | | | | | | | | | | | The problem was due to incorrect loading of the MDL configuratoion The issues is fixed after loading the MDL configiration in the right order Change-Id: Id33f680e089e71a10f9dd00163f931daa277b021
* | | Fix for random bluetooth crash on transfer contextRavi Nagarajan2012-08-211-26/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Crash is seen while attempting to memcpy more data than what is actually available. Root cause is that the stack callbacks where sending arguments which are union members and not the union structure. This resulted in a crash during memcpy bug 7016761 Change-Id: I55ad3c885d1634e44833152ed0808b09e437a657
* | | Merge "Add support for per device bluetooth configuration." into jb-mr1-devWink Saville2012-08-2026-2351/+516
|\ \ \
| * | | Add support for per device bluetooth configuration.Wink Saville2012-08-1626-2351/+516
| |/ / | | | | | | | | | | | | | | | | | | | | | Rather than using a text file and generating each buildcfg.h file per device bdroid_buildcfg.h which supplies device specific values and then bt_target.h will supply common values. Change-Id: I12cb5408729c3e076562a292204f07a0c4b52628
* | | Initiate Open for incoming AV even if SDP INT failsKausik Sinnaswamy2012-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | There are some devices that do not respond to SDP request while they are in the midst of initiating an AV connection. In such cases, it is valid to ignore the SDP failure and initiate the AV open. bug 6996250 Change-Id: I16149fee9b6ee6130cf45396246948716898b167
* | | Modified HID host to use kernel UHID driverPriti Aghera2012-08-172-110/+104
|/ / | | | | | | | | | | Included more error checking and removed unused code Removed header file as the header file will be included in kernel Change-Id: I3086d6520fc764b73e0e740dadaa64a9cdc11945
* | Updated BTM_DEF_LOCAL_NAME to be "Nexus"Reena Lee2012-08-151-1/+1
| | | | | | | | Change-Id: Ic596804bf6a25e4f039860348298f296edc9cd8f
* | Add HCI Multi-Channel Transport support (1/2)YK Jeffrey Chao2012-08-1410-136/+1991
|/ | | | | | Revise BT Vendor Lib interface and add support of HCI multi-channel transport. Change-Id: I5a7a7b64798bb30be60ed29bd564bc499bd5b5bc
* Avoid duplicate unsolicited indicatorsRavi Nagarajan2012-08-142-0/+37
| | | | | | | | Avoid duplicate notifications for service, signal, roam and battery charge bug 6983415 Change-Id: If68ea7315de4f964e7fb83a6a628c8d2c29a333d
* Enhanced bluetooth HAL with DUT mode APIsKausik Sinnaswamy2012-08-138-5/+1023
| | | | | | | These APIs are needed to allow the bluetooth chip to be put into DUT mode so that RF/BB BQB tests can be run Change-Id: Ie5be00da567bc94173f35b098abcaf6f6603a129
* Send auth fail for both auto & non-auto pair triesRavi Nagarajan2012-08-091-1/+2
| | | | | | | | | Both when auto-pair attempts exceeded or when auto-pair was not attempted, but authentication failure was observed, send auth fail to upper layer bug 6936335 Change-Id: Ieafd0c6bbc57fb36cf4c2c450556e4df7ec23a1a
* Fix issue with passing wrong str len to java layerGanesh Ganapathi Batta2012-08-092-3/+3
| | | | | | | Send only length of string to Java instead of length +1 from btif for local Bluetooth name, Remote name and Friendly name for paired devices. Change-Id: I4e822db62eb2affaadad283c6ceb2a368e3b107c
* Revise BT vendor lib interface (1/2)YK Jeffrey Chao2012-08-096-103/+202
| | | | | | | | | 1. Move UART port configuration into vendor lib to respect the fact that each vendor might have different UART port settings for its own chipsets. 2. Detail bt_vendor_lib.h header file with usage instructions. Change-Id: I10dc44afd9b3cc1985769166a717089728281296
* choose generic one if there is no board specific configurationKeun young Park2012-08-011-0/+4
| | | | | | - fix PDK mini builds Change-Id: Ic5cd4975210f70d028938b1f306ea38de27191a4