History log of /system/bluetooth/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
2588cd802f322650ed737dfb7a10e9ad94064e99 01-Nov-2011 The Android Automerger <android-build@android.com> merge in ics-mr1-release history after reset to ics-mr1
62432dd0bb4d59f640bde9309f86eef2fd984f18 27-Oct-2011 Matthew Xie <mattx@google.com> Check EALREADY status for HCIDEVUP command

Both bluez and bluedroid starts up HCI driver. If bluez starts the driver
before bluedroid. Current bluedroid fails incorrectly. Bluedroid should
treat EALREADY error code as success.
We place a warning message when EALREADY error happens. The reason is that
bluedroid should always starts up HCI driver first. bluedroid starts up
bluetoothd afterwards.
bug 5496360

Change-Id: I316a2b3ec52bfbe6d1cdf554eac3deabfd63f3da
luedroid/bluetooth.c
af0d8c6b6c8fc52a542fe2dbb206ec3d297a6ef7 23-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
b9bcd9fe3a607df1589e55760cf5cef7fb5618ad 30-Sep-2011 Chunho Park <chun.ho.park@samsung.com> Bluetooth: Add BMW MINI10013 in blacklist

-To avoid repeated attempts error.

Change-Id: I28ba4894bf4a8063cea8407d193356f8c27da7b3
Signed-off-by: Chunho Park <chun.ho.park@samsung.com>
ata/auto_pairing.conf
33ca8229bc57023b08b8fe42b7c2f434bfd0331f 11-Sep-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
5cd290f3284add3bda6085c16346bb37d6cc291e 09-Sep-2011 Matthew Xie <mattx@google.com> Merge "Sync main.confs with that of Bluez"
37746f8c5b7a6d37d1cebc22fcbfc957f6e91abc 09-Sep-2011 Matthew Xie <mattx@google.com> Sync main.confs with that of Bluez

The only change is DiscoverSchedulerInterval changes from 0 to 30
bug 5265282

Change-Id: Iad709d8bb97f939f008b9dbca5b5660547d492b3
ata/main.conf
ata/main.le.conf
ata/main.nonsmartphone.conf
ata/main.nonsmartphone.le.conf
03e581f736c926895efa8950f1c662e24774d882 08-Sep-2011 Matthew Xie <mattx@google.com> Change RememberPowered to false

Change RememberPowered to false so that the power event is powerup after Bluez
starts so that the adapter state machine can recover bluez crash easier.
bug 5239719

Change-Id: I4b5b208ee89b4d072192f4b59003e76e22ed2d10
ata/main.conf
ata/main.le.conf
ata/main.nonsmartphone.conf
ata/main.nonsmartphone.le.conf
b5a0dc0bd11cad143790d73b11ebad3564ff0b26 15-Aug-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
594b77a493c44186af3d6f6a6bc7b30babcb2896 11-Aug-2011 Jaikumar Ganesh <jaikumar@google.com> Change class to handheld from Laptop.

This makes it work with digital pens and other devices.

Change-Id: Ia0615cdd6713efdeac2da096bbd9cfb84ad8fa67
ata/main.nonsmartphone.conf
ata/main.nonsmartphone.le.conf
2e6842e43e67a12a98e3e75ecb77cfa17c2bb028 01-Aug-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
cd60add87bf628e96d3a91dc96d4bf945a0ccb17 29-Jul-2011 jhtop.kim <jhtop.kim@samsung.com> Bluetooth: fix for the unrecoverable state after BT on is failed

- When bt_enable() is called ,device try to turn on hci device.
if timeout happened after 10 seconds try,set_bluetooth_power() is called.
but hciattach is still running state, so turning on BT will fail.
it is unrecoverable before device reboot.

- add code for hciattach stop

Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>

Change-Id: Id210995eb4e811994d40e1a5f567606f2b9a0207
luedroid/bluetooth.c
2c0ab91aa1b66c2d4ec56907a2b14846ecddefc4 28-Jul-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
5c164ab40fe058b8ff6b1e482845d1ad55ea5de7 27-Jul-2011 The Android Automerger <android-build@android.com> keep history
9bb0edea288194e6777514b8aca5923f6c5c1268 21-Jul-2011 Jaikumar Ganesh <jaikumar@google.com> Add Car to the partial name blacklist.

Another signal not to trigger auto pairing.

Change-Id: I56bb2b7e7e18a255456c238b864b474038da315a
ata/auto_pairing.conf
8835637550b0dcb6100d0fcdb58ca1b20d2ad76f 08-Jul-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
e00328767e40137af91c15a7d69bb9a18b6ae4a5 07-Jul-2011 Jaikumar Ganesh <jaikumar@google.com> Fix setting of baud rate when coming out of reset.

Broadcomm convention requires that when we come out of reset
the baud rate is set to the default rate.

Original author: Mark Mendelsohn <mendelso@broadcom.com>

Change-Id: I40a34e02b3ca6eeac48fbbac8c41c35423f7fd91
rcm_patchram_plus/brcm_patchram_plus.c
72c78a76465ad68136b7f49d6e56464205ef3dbc 07-Jul-2011 Jaikumar Ganesh <jaikumar@google.com> Fix setting of baud rate when coming out of reset.

Broadcomm convention requires that when we come out of reset
the baud rate is set to the default rate.

Original author: Mark Mendelsohn <mendelso@broadcom.com>

Change-Id: I40a34e02b3ca6eeac48fbbac8c41c35423f7fd91
rcm_patchram_plus/brcm_patchram_plus.c
04a1a722bda65ea26fc449a613085909056c1fa2 25-Jun-2011 Jaikumar Ganesh <jaikumar@google.com> Log return error code for failure case.

This will help debug BT turn on problems.

Change-Id: Idda3dcdc6727e4b017f4a7a2805facc217340144
luedroid/bluetooth.c
e1276c208588797c46cfe809f346becdb89eb9c0 17-Jun-2011 Howard M. Harte <hharte@broadcom.com> Bluetooth BRCM script updates for new chipsets.

1) add support for configuration of the SCO PCM interface
2) add support for configuration of the I2S interface
3) add support for different patchram download initialization for newer chips
4) Address review comments from change 22918.

Change-Id: I7b764a65d1d7bbcaa46a7a5100566047d1ce3165
rcm_patchram_plus/Android.mk
rcm_patchram_plus/brcm_patchram_plus.c
07b99aac54cbd4991dea9e31bc99736bfd648d9b 18-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Merge

Change-Id: I7962f5e491d6e8beacc3b5c7999bd6fcc9223ef6
a08d7dc2165e1658dfe6c47de71d9b7f4745c3c3 18-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Merge

Change-Id: I7f8468b214a256fb1bef8c01c3583449f977dc7e
6291f5ee93564d461f6408bc446b1a7bac94aca2 18-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Merge

Change-Id: Ib302cc06ca49b7f94bf88517231de2e990582701
283de703fe31a226d8d4bf698e5b114b813c1de8 18-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Merge

Change-Id: I9d20ef1bef6017f0697f005ef0c68836e74480c4
2f4c1c9823a5d28580f4a06dec405f26bb7d22c5 18-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Merge "marker to enable legacy behaviors"
4699973d8a80f0db4a42b4cf80f5d3722be2793f 18-Jun-2011 Jean-Baptiste Queru <jbq@google.com> marker to enable legacy behaviors

Change-Id: Ia01ce4fb3bc1233f3ddc642724792ea16fe0c56c
egacy.mk
4be84070d6e38f099f74875df9436be52baac5d6 18-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Merge "Restore code that was removed too aggressively"
55b5b79a599dfd0bb85295309504f3e5613817fa 18-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Restore code that was removed too aggressively

Change-Id: Ia1659f71e9e531c073c753a61b6ef53028749422
luez-clean-headers/bluetooth/bluetooth.h
01e8f1a88f30e14f52e356c21492c4a9e3142c31 18-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Merge "tweak for forward-compatibility"
d93f41e891b83e7b64233b26439657c63852d10c 18-Jun-2011 Jean-Baptiste Queru <jbq@google.com> tweak for forward-compatibility

Change-Id: I1043cd1119784747aca7e02102373db2236597ca
luez-clean-headers/bluetooth/bluetooth.h
ef070be0b11c4c729df75a46426d5666f31499ab 26-May-2011 Jaikumar Ganesh <jaikumar@google.com> Add LE variants for the main.conf files.

Change-Id: I51a8bcf9f7e22b9683f4d7508caa34f511fa81dc
ata/main.le.conf
ata/main.nonsmartphone.le.conf
2988f3cc865ebc6a27457fec2338ed5486da4120 18-May-2011 Jean-Baptiste Queru <jbq@google.com> Merge from honeycomb-plus-aosp

Change-Id: I4766a77082d78e18a63b2a74aa6fb9cf586d072a
219ba38bad908b1ed908bbe231283ffc835d81a0 18-May-2011 Jaikumar Ganesh <jaikumarg@android.com> Merge "Update License to Apache."
fd8ee4744176894d5a8ee28645fa342b859f4893 17-May-2011 Howard M. Harte <hharte@broadcom.com> Update License to Apache.

Change-Id: If7e4c039ac20c8a91bdc07081c0f3900385a0051
rcm_patchram_plus/brcm_patchram_plus.c
1890bf01833f6cab431f014af7a20fcbed3a4e13 30-Mar-2011 Jaikumar Ganesh <jaikumar@google.com> Implement HCI_UP test bit function inline.

Change-Id: Id3a5a690fb1414912ce5a58e991a3aa63d3afcdd
luedroid/bluetooth.c
3494f1d256b07675b8d2d3df1ea709a721e14be3 22-Mar-2011 Jaikumar Ganesh <jaikumar@google.com> Update conf files for Bluez upgrade to 4.89

Change-Id: Ie27ae5f6e71372ed1109df5b648c9e502db61a5a
ata/audio.conf
ata/main.conf
ata/main.nonsmartphone.conf
40d3651f0ad7f3e25950ff7124547438bef57be7 22-Mar-2011 Jaikumar Ganesh <jaikumar@google.com> Update header files for Bluez upgrade to 4.89
luez-clean-headers/bluetooth/bluetooth.h
luez-clean-headers/bluetooth/hci.h
luez-clean-headers/bluetooth/hci_lib.h
luez-clean-headers/bluetooth/l2cap.h
luez-clean-headers/bluetooth/rfcomm.h
luez-clean-headers/bluetooth/sco.h
596d8cae44844161b5b182d3defa681e1200dd46 08-Feb-2011 Jaikumar Ganesh <jaikumar@google.com> Add Peugeot 307 to the auto pairing blacklist.

Change-Id: I8c3e582c3e9eec190218df704212b40c205c95cf
ata/auto_pairing.conf
dad064dc614b7c582a011f0addbff2a9eb68c195 03-Feb-2011 Jaikumar Ganesh <jaikumar@google.com> Set rfkill power off if turning BT on fails.

Bug:3397042

This was needed anyway for proper cleanup but even more
so as BT and Wifi share the same GPIO line for power to the chipset.

Change-Id: I77dc26fadb72710965af66536c85c5dcb30f2290
luedroid/bluetooth.c
0c57c2048dea6d2c00e16ff1624db149e2d4a7bd 12-Jan-2011 Jaikumar Ganesh <jaikumar@google.com> Add Mot keyboard to blacklist file.

Change-Id: Ibe4f3ca0e415981e8ad5ee3f057a5643eff42907
ata/auto_pairing.conf
d15a37448edcc1bd314873732ce5f3ea7ddad4ba 20-Dec-2010 Jaikumar Ganesh <jaikumar@google.com> Fix corruption while reading the address.

Hide printfs with debug option.

Change-Id: I5f9f1845664cd1540ea396d87dfa46e0abb157c1
rcm_patchram_plus/brcm_patchram_plus.c
fff5ba85648ed4346d6feb3639aeafa6874bf640 08-Dec-2010 Jaikumar Ganesh <jaikumar@google.com> Add option to set the baudrate before downloading the firmware.

This reduces BT start up time by 2 secs.

Change-Id: Ib67637aa79c72dc988ad5398312379945d97017b
rcm_patchram_plus/brcm_patchram_plus.c
7385aa293ea3c9a7d74bf9ca8c4d61f0682c4767 24-Nov-2010 Jaikumar Ganesh <jaikumar@google.com> Minor class bits cannot be ORed.

For non smartphone case, set laptop for minor class.

Change-Id: I526193fac3a24aa46da959c88447c065729a0dfb
ata/main.nonsmartphone.conf
f96a05d05bd5c5547a922842d788334c32acde1a 24-Nov-2010 Jaikumar Ganesh <jaikumar@google.com> Change Service class for nonsmartphone case.

Change from telephony to capturing + networking - which
seems like the best possible fit.

Change-Id: Ifa8139a45f149fa3168a754f2398a402a0fb3855
ata/main.nonsmartphone.conf
059176782b8bdd8f54896181697793c583a4befe 10-Nov-2010 Jaikumar Ganesh <jaikumar@google.com> Add BT_POWER socket option and bt_power structure.

Change-Id: I3be96c31ff97290bdb76adaf512843fe7a3b746d
luez-clean-headers/bluetooth/bluetooth.h
1725ef80c89ba54e0b246d5d4d31e217496d01b5 03-Nov-2010 Chris Fries <C.Fries@motorola.com> Add command-line option for PCM master/slave to brcm_patchram_plus

Added a command-line option to set PCM interface as master or slave, and
send the HCI command as required for each mode.

Change-Id: I496909c8aaa888aabfc2bb6c10a288da7b448ff8
rcm_patchram_plus/Android.mk
rcm_patchram_plus/brcm_patchram_plus.c
89a579d14afd6d0ddb9c41056d71a41901c33c5b 01-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am 9bd98263: am b520f840: Merge "System/bluetooth/bludroid:Remove the 3 second delay after starting bluetoothd"

* commit '9bd982632d50543f9e080a7595344591ab62874b':
System/bluetooth/bludroid:Remove the 3 second delay after starting bluetoothd
9bd982632d50543f9e080a7595344591ab62874b 01-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am b520f840: Merge "System/bluetooth/bludroid:Remove the 3 second delay after starting bluetoothd"

* commit 'b520f840479ce62b52072987d8f7883c1edac17b':
System/bluetooth/bludroid:Remove the 3 second delay after starting bluetoothd
b520f840479ce62b52072987d8f7883c1edac17b 01-Nov-2010 Jean-Baptiste Queru <jbq@google.com> Merge "System/bluetooth/bludroid:Remove the 3 second delay after starting bluetoothd"
2dbc46f687f9329695156133fc9feefc750d1526 04-Oct-2010 Bheemsen Kulkarni <x0099674@ti.com> System/bluetooth/bludroid:Remove the 3 second delay after starting bluetoothd

Remove the 3 second delay, which is not required for bluetoothd,
We wait for 10 secs to get the adapter path in android_server_BluetoothEventLoop.cpp,
which will handle the bluetoothd delay.

original change by: Bheemsen Kulkarni <x0099674@ti.com>

Change-Id: I194610675fcca70c908baf206318281ecde78fab
luedroid/bluetooth.c
2569c60e01c05214f0d1eb8e15d6f3be37bcc905 19-Oct-2010 Jaikumar Ganesh <jaikumar@google.com> am 7dc55059: Add Parrot car kit (KML_CAN) to the auto pairing blacklist.

Merge commit '7dc550597f490a67c8d020c727bfbf2d9d212d42'

* commit '7dc550597f490a67c8d020c727bfbf2d9d212d42':
Add Parrot car kit (KML_CAN) to the auto pairing blacklist.
7dc550597f490a67c8d020c727bfbf2d9d212d42 19-Oct-2010 Jaikumar Ganesh <jaikumar@google.com> Add Parrot car kit (KML_CAN) to the auto pairing blacklist.

Bug: 3110801

Change-Id: I3e85af559cd44d55a682b45606aa9ac1d2eabc74
ata/auto_pairing.conf
dd44d8da9f05e3e38a618dc27e354939337d3624 14-Oct-2010 Jaikumar Ganesh <jaikumar@google.com> Set BT class for nonsmartphone case.

Change-Id: Iafcd7b311c2b28ae185dd3d5974df3eaa5b02109
ata/main.nonsmartphone.conf
46cb4a61978ffd6bb1d97c17622aa9cab6ebf250 04-Oct-2010 Bheemsen Kulkarni <x0099674@ti.com> System/bluetooth/bludroid:Remove the 3 second delay after starting bluetoothd

Remove the 3 second delay, which is not required for bluetoothd,
We wait for 10 secs to get the adapter path in android_server_BluetoothEventLoop.cpp,
which will handle the bluetoothd delay.

Change-Id: I194610675fcca70c908baf206318281ecde78fab
Signed-off-by: Bheemsen Kulkarni <x0099674@ti.com>
luedroid/bluetooth.c
5b2fd3f342d37a1245cacee26d3133ac0ed0e701 28-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> am 501cc9c1: Revert "Delay 200 ms after powering up the BT chip.."

Merge commit '501cc9c1a855f206117398d3d36e9e3880b71693'

* commit '501cc9c1a855f206117398d3d36e9e3880b71693':
Revert "Delay 200 ms after powering up the BT chip.."
501cc9c1a855f206117398d3d36e9e3880b71693 28-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> Revert "Delay 200 ms after powering up the BT chip.."

This should be done either in rfkill driver or in the firmware load file.

This reverts commit 82b2b955c801eb69eddf736676b8116c7c821e3a.
luedroid/bluetooth.c
1a441a6fa73b4de7d6d93564eb244a3232afc539 27-Sep-2010 Jean-Baptiste Queru <jbq@google.com> Separate smarthphone and nonsmartphone variants.

Delete the makefile here, this is now handled by a
PRODUCT_COPY_FILES in the base makefiles.

Change-Id: I03728d9a70f36296b0125cfe26f1a971b05b4331
ata/Android.mk
ata/main.nonsmartphone.conf
3acc325289da36a9e7b19fa21cf6074c310827dd 10-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> am 3cd1a144: Set line discipline to HCI_UART_H4 even for low power mode.

Merge commit '3cd1a1440d74cc31be247f0bd967a432d26042ac'

* commit '3cd1a1440d74cc31be247f0bd967a432d26042ac':
Set line discipline to HCI_UART_H4 even for low power mode.
23bb4577b721bc77aba8416cb73f94fb38074bca 10-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> am 82b2b955: Delay 200 ms after powering up the BT chip..

Merge commit '82b2b955c801eb69eddf736676b8116c7c821e3a'

* commit '82b2b955c801eb69eddf736676b8116c7c821e3a':
Delay 200 ms after powering up the BT chip..
3cd1a1440d74cc31be247f0bd967a432d26042ac 10-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> Set line discipline to HCI_UART_H4 even for low power mode.

HCI_UART_LL is almost similar to H4 line and wouldn't cause
any problems since the extra packets were not being used any
way. But to avoid confusion, its being changed.

Based on a report by: goodsc.lee@samsung.com

Change-Id: Ifcb8bd5d8d619b74225057a6f7b5eee2c94a9925
rcm_patchram_plus/brcm_patchram_plus.c
82b2b955c801eb69eddf736676b8116c7c821e3a 10-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> Delay 200 ms after powering up the BT chip..

The reset pin requires this time to stabilize.
Patch contributed by:HYUNG SEOUNG YOO <hyungseoung.yoo@samsung.com>

Change-Id: I452c6188696e3598ba22b58a8f4144dad50b7e07
luedroid/bluetooth.c
d499eb8ba024c78bfa96178ec073f2f8443fe013 19-Aug-2010 Danica Chang <danicachang@google.com> Merge "added conf file for network"
1eb78ae8115707d683aaa277ab61b78897344b2c 12-Aug-2010 Danica Chang <danicachang@google.com> added conf file for network

Change-Id: I0400137d88c168f9a2ab0ea6b0a212cc39a7630b
ata/Android.mk
ata/network.conf
0df913111ab36a1717f0cdb59dd51d8e6815b0be 11-Aug-2010 Jaikumar Ganesh <jaikumar@google.com> Add parrot to the blacklist for auto pairing.

Change-Id: Ifd31ceb25d6a13d06d7d3decf82b2c69d91111dc
ata/auto_pairing.conf
30a738e653aa2d9f7670d0b19409ce30916cc397 06-Apr-2010 Nick Pelly <npelly@google.com> Update brfpatch for new TI firmware scripts.

- Add support for 6 byte parameters
- Add support for 16 byte parameters

brfpatch is only used to generate firmware, it is not installed on the device.

Change-Id: I14076054ac211dec1cab6117acfa77de65d11239
rfpatch/brfpatch.c
068489e557bd95bfb48e9b5da0eac9027961a9e9 30-Mar-2010 Jaikumar Ganesh <jaikumar@google.com> Add another car kit vendor to the blacklist file.

Bug: 2545955
ata/auto_pairing.conf
99e689476f3783c9205557d6abad1c198bd45117 24-Mar-2010 Nick Pelly <npelly@google.com> Add hci_command_hdr to clean bluez headers.

Change-Id: Ibd753b7f59926b5e1fc8eb856c0bd4193815154e
luez-clean-headers/bluetooth/hci.h
5fd8fa30e402126343abf061c177fbb4d155ca3b 03-Mar-2010 Bao Liang <tim.bao@motorola.com> Disable park state in main.conf

This is to match code change in external/bluetooth/bluez/, which
allow configuration of park state support. Turn off park state
on Android to avoid connection lost with devices supporting park
state.

Signed-off-by: Bao Liang <tim.bao@motorola.com>
ata/main.conf
b0a735250760cd6dbe8c4e446202426918eb7bd9 16-Mar-2010 Eric Olsen <eolsen@android.com> Add blacklist for Bluetooth SCO connections
- Add exceptions for Motorola HF850 and Infinity G350

Signed-off-by: Eric Olsen <eolsen@android.com>

Change-Id: I417c8f8f63420b4a6a0f7a64972bafd893f6d132
ata/Android.mk
ata/blacklist.conf
deaab6fa4a94c31494ebb6770dd0532198d0cbca 16-Mar-2010 Nick Pelly <npelly@google.com> Delay 50ms before downlooading firmware patch to fix BCM4329B1 incompatability.

Change-Id: If4e0040a55e54d6e6be2a4e6ca0c3d56c3999095
rcm_patchram_plus/brcm_patchram_plus.c
346ddecc868edae78cfecd1807bf0094d0f74306 09-Mar-2010 Jean-Baptiste Queru <jbq@google.com> Add an empty CleanSpec.mk

Change-Id: Id067b3f709a3a392a7e52f02bdba7fcb37f2f66f
leanSpec.mk
a2ccf35dedf6c81f66c174c1c04b560ae19bd6eb 26-Feb-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Add Auto Pairing blacklist, change paths."
59ca0be6dc8ef3f30f8f863d8fb805a55bf12fe5 25-Feb-2010 Nick Pelly <npelly@google.com> Update bluez clean headers for struct sockaddr_sco change.

Change-Id: I0966ed325ea798e4a3367e201c03a2dafdb8247a
luez-clean-headers/bluetooth/hci.h
luez-clean-headers/bluetooth/sco.h
392cd2701f950055bffb5f57f2a8730434491834 09-Feb-2010 Nick Pelly <npelly@google.com> Do not attempt role switch to Master.

Just causes too many problems with legacy carkits that cannot handle role
switch.

Change-Id: I1328260d2bcf1968c34a86d1dc3b2fc624b3d91b
ata/audio.conf
2a0c326859bee0e7f9362d25a1b3ae973570d095 05-Feb-2010 The Android Open Source Project <initial-contribution@android.com> am d7a53f14: am 39760b25: reconcile main tree with open-source eclair

Merge commit 'd7a53f143d0733c26612af1754944826fd0841dc'

* commit 'd7a53f143d0733c26612af1754944826fd0841dc':
android-2.1_r1 snapshot
d7a53f143d0733c26612af1754944826fd0841dc 05-Feb-2010 The Android Open Source Project <initial-contribution@android.com> am 39760b25: reconcile main tree with open-source eclair

Merge commit '39760b2529e6ef58ab49762703b2ee37fdbd7db5' into eclair-plus-aosp

* commit '39760b2529e6ef58ab49762703b2ee37fdbd7db5':
android-2.1_r1 snapshot
39760b2529e6ef58ab49762703b2ee37fdbd7db5 05-Feb-2010 The Android Open Source Project <initial-contribution@android.com> reconcile main tree with open-source eclair
8af4432c512d262c07776fb5e112bfcf9c4cceec 29-Jan-2010 The Android Open Source Project <initial-contribution@android.com> reconcile android-2.1_r1 snapshot
c7b1c3b2b2909bbf082cc1824adbe14ffdad0750 13-Jan-2010 The Android Open Source Project <initial-contribution@android.com> android-2.1_r1 snapshot
luez-clean-headers/bluetooth/hci.h
luez-clean-headers/bluetooth/l2cap.h
9f4058cf9e13b105685fccbb0b9cba1b20757e8c 08-Jan-2010 Jaikumar Ganesh <jaikumar@google.com> Add Auto Pairing blacklist, change paths.
ata/Android.mk
ata/auto_pairing.conf
8b9627f9aa987dbdb74199d8120d260673bc94db 15-Dec-2009 Android Git Automerger <android-git-automerger@android.com> Merge commit 'goog/eclair-plus-aosp'
c11900e9501d4156bba57356d2144f16415a70fa 11-Dec-2009 Nick Pelly <npelly@google.com> am 4522d8ef: Add L2CAP_LM_FLUSHABLE to clean Bluez headers.

Merge commit '4522d8ef8b710ac67752ac51ef2d3405cf1032cd' into eclair-mr2-plus-aosp

* commit '4522d8ef8b710ac67752ac51ef2d3405cf1032cd':
Add L2CAP_LM_FLUSHABLE to clean Bluez headers.
97607af496d0e7cff0ede300ea3e0f2db2cb843a 11-Dec-2009 Nick Pelly <npelly@google.com> am dc18c419: Update Bluez header for new ACL state debug parameters.

Merge commit 'dc18c419590935a7bcb180ae932e543defd73e18' into eclair-mr2-plus-aosp

* commit 'dc18c419590935a7bcb180ae932e543defd73e18':
Update Bluez header for new ACL state debug parameters.
1473f4c4c5ce25c1fb9ceeffb73516dd587a9cc9 09-Dec-2009 Nick Pelly <npelly@google.com> am 4522d8ef: Add L2CAP_LM_FLUSHABLE to clean Bluez headers.

Merge commit '4522d8ef8b710ac67752ac51ef2d3405cf1032cd' into eclair-plus-aosp

* commit '4522d8ef8b710ac67752ac51ef2d3405cf1032cd':
Add L2CAP_LM_FLUSHABLE to clean Bluez headers.
66184df250fb52ab3c5b4a155870618479031c18 09-Dec-2009 Nick Pelly <npelly@google.com> am dc18c419: Update Bluez header for new ACL state debug parameters.

Merge commit 'dc18c419590935a7bcb180ae932e543defd73e18' into eclair-plus-aosp

* commit 'dc18c419590935a7bcb180ae932e543defd73e18':
Update Bluez header for new ACL state debug parameters.
4522d8ef8b710ac67752ac51ef2d3405cf1032cd 09-Dec-2009 Nick Pelly <npelly@google.com> Add L2CAP_LM_FLUSHABLE to clean Bluez headers.
luez-clean-headers/bluetooth/l2cap.h
dc18c419590935a7bcb180ae932e543defd73e18 09-Dec-2009 Nick Pelly <npelly@google.com> Update Bluez header for new ACL state debug parameters.
luez-clean-headers/bluetooth/hci.h
83895b4c97d2487bfdc21c3eff1860a8a33205ce 15-Nov-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
2e477647182b77fa98448275cdf9e5976dce5f56 15-Nov-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master

Merge commit 'goog/stage-korg-master' into HEAD
ad79b6346ebfd70ce6d4db4a0d5f941917521fb9 15-Nov-2009 Jean-Baptiste Queru <jbq@google.com> merge from eclair
327e4ab9cc1fa9eeb7243ad6ee28dfcc7b212a5b 13-Nov-2009 Jean-Baptiste Queru <jbq@google.com> eclair snapshot
luedroid/Android.mk
luedroid/bluetooth.c
luedroid/bttest.c
luedroid/include/bluedroid/bluetooth.h
luez-clean-headers/bluetooth/hci.h
luez-clean-headers/bluetooth/l2cap.h
rcm_patchram_plus/Android.mk
rcm_patchram_plus/brcm_patchram_plus.c
ata/Android.mk
ata/audio.conf
ata/hcid.conf
ata/input.conf
ata/main.conf
ools/Android.mk
ools/asocket_test.c
ools/bttest.c
ools/pipetest.c
ools/sock_shutdown_bug_l2cap.c
ools/sock_shutdown_bug_rfcomm.c
ools/sock_shutdown_bug_tcp.c
ools/sock_shutdown_test.c
ools/socktest.c
a15c33f9aaf27f75a7f6fa02a539b54caace4d35 31-Oct-2009 Nick Pelly <npelly@google.com> Add support for ba2str and str2ba to bluedroid.

Add missing structs from hci.h.

Change-Id: I4cebb3136cd832d5b61f4cd70bcf4504238e2531
luedroid/bluetooth.c
luedroid/include/bluedroid/bluetooth.h
luez-clean-headers/bluetooth/hci.h
ools/Android.mk
d4397861e745c5b6ae99fe547b841df9babf3085 30-Oct-2009 Nick Pelly <npelly@google.com> Fix low power mode bugs in brcm_patchram_plus.

Enable LPM before setting up HCI network device. Set WAKE and HOST_WAKE
to active high.

Change-Id: I0ec15ec46ce355413f6476d0561f4d281487be33
rcm_patchram_plus/brcm_patchram_plus.c
f4fb9463cca2648a354dbbe1a62a887c1b4cd0d4 30-Oct-2009 Nick Pelly <npelly@google.com> Add hci struct to clean headers.

Change-Id: I47cc7c8dcd86ffab4dc86e2b371bc99d0bb57730
luez-clean-headers/bluetooth/hci.h
db5ccf71519a49fbb36b915dba551aa0b3fa0db8 21-Oct-2009 Nick Pelly <npelly@google.com> Read Bluetooth address from system property ro.bt.bdaddr_path

Change-Id: I1d308818099636354448708c8a7d4c13219f504d
rcm_patchram_plus/Android.mk
rcm_patchram_plus/brcm_patchram_plus.c
fcdaefeec9091b104adfd3ba967bdebe14c34cdf 15-Sep-2009 Nick Pelly <npelly@google.com> Checkpoint of debug tools changes.

Change-Id: I4a4f00cca3569c62770b323a24b1754873778e91
ools/Android.mk
ools/sock_shutdown_bug_rfcomm.c
ools/sock_shutdown_bug_tcp.c
f95f92bccbeb441bfc20479f65f5c079a371cca7 01-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23505 into eclair

* changes:
Checkin some testing tools. Not compiled by default.
10d31b957a35d4ac084be33b0f136568039c9c14 01-Sep-2009 Nick Pelly <npelly@google.com> Checkin some testing tools. Not compiled by default.
ools/sock_shutdown_bug_l2cap.c
ools/sock_shutdown_bug_rfcomm.c
ools/sock_shutdown_test.c
ac8c432d8eea5f875f672c2a7755c40a76a3c8cd 21-Aug-2009 Nick Pelly <npelly@google.com> Switch from DOS to UNIX format on brcm_patchram_plus.c

dos2unix brcm_patchram_plus.c. No code change.
rcm_patchram_plus/brcm_patchram_plus.c
3a0f5331b257c95a69b077bd7ec8b5fdf5aeaa9e 21-Aug-2009 Nick Pelly <npelly@google.com> Fix baudrate programming for BCM chipsets.

The encoded form was broken for most baud rates. Instead use big endian
explicit baud rate.
rcm_patchram_plus/brcm_patchram_plus.c
58302b4259856ddbedc8b4c15c02cbc7bec8acd3 21-Aug-2009 Nick Pelly <npelly@google.com> Add brcm_patchram_plus from Broadcom.

Used to download firmware to BCM bluetooth chipsets.
rcm_patchram_plus/Android.mk
rcm_patchram_plus/brcm_patchram_plus.c
344bcd8d730e0a0313cf079fbc74a4ed4b19ced3 19-Aug-2009 Nick Pelly <npelly@google.com> Do not advertise A2DP sink support.
ata/audio.conf
01ef9d38dc52476e93c1ad78dd191d289eede7e2 18-Aug-2009 Nick Pelly <npelly@google.com> Strip extra quotes from device name.
ata/main.conf
d696a493f60d670968234b1d11b8afa015d1b23f 03-Aug-2009 Jaikumar Ganesh <jaikumar@google.com> Set class field appropriately.
ata/main.conf
9baad993d9788e544c3a30fcc5dae23fe8b1d074 23-Jun-2009 Nick Pelly <npelly@google.com> Checkpoint some debug tools. Not built by default.
ools/Android.mk
ools/asocket_test.c
ools/sock_shutdown_test.c
ools/socktest.c
e9e80e66c601bbe1e4d8b1039f37f08683f65211 10-Jun-2009 Jaikumar Ganesh <jaikumar@google.com> Add ro.product.model for name of the device.

Use the system property ro.product.model to pick up the device name.
ata/main.conf
12f7feb45d8bfcf8514143103ac30bc4efee26f6 06-May-2009 Jaikumar Ganesh <jaikumar@google.com> Bluez4 changes.

Rename hcid to bluetoothd, and add the new config files.
luedroid/bluetooth.c
ata/Android.mk
ata/audio.conf
ata/hcid.conf
ata/input.conf
ata/main.conf
47653588a022190d4b3e20194ef643dfb7b90632 18-May-2009 Nick Pelly <npelly@google.com> Adding functionality to tests.
ools/Android.mk
ools/pipetest.c
ools/sock_shutdown_test.c
ools/socktest.c
07e2e433c27fb8c0bebe2b6b2f0865f3314aaeca 15-May-2009 Nick Pelly <npelly@google.com> Fix pipetest build.
ools/pipetest.c
da6b47d85efb7780a50986672ea6255514af150a 15-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1786

* changes:
Move socktest.
1bf4483171f402ffe59301c400d3c50f5b0128b5 15-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1785

* changes:
Move bttest to new location in system/bluetooth/tools
538537db75483eded432617a5f8221d98bc3202b 15-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1784

* changes:
Add pipetest test utility.
3f61fb90d08d4848a7d7dd24180c2b95ebd60bfc 15-May-2009 Nick Pelly <npelly@google.com> Move socktest.
luedroid/socktest.c
ools/Android.mk
ools/socktest.c
154f39e82e04e93cf2093ec8bd10de98ea03e32b 15-May-2009 Nick Pelly <npelly@google.com> Move bttest to new location in system/bluetooth/tools
luedroid/Android.mk
luedroid/bttest.c
ools/Android.mk
ools/bttest.c
8e914727cfa67d9fd7407970e3b694fe72824ee2 15-May-2009 Nick Pelly <npelly@google.com> Add pipetest test utility.
ools/Android.mk
ools/pipetest.c
6a2f026a8c1a0849998a42658ca2510693e667b8 13-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1398

* changes:
Add utility for testing native code sockets.
9c8ee388f930a671f68401efde588ce05992e977 13-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1395

* changes:
Add l2cap.h to bluez clean headers.
b88063b946e2c8f349e69c7db0a631088f991fc4 11-May-2009 Nick Pelly <npelly@google.com> Add utility for testing native code sockets.

Signed-off-by: Nick Pelly <npelly@google.com>
luedroid/Android.mk
luedroid/socktest.c
565816179ce7b754db55a2ab3e9ef877dca2f69b 11-May-2009 Nick Pelly <npelly@google.com> Add l2cap.h to bluez clean headers.

Auto-generated from bluez using clean-header.py.

Signed-off-by: Nick Pelly <npelly@google.com>
luez-clean-headers/bluetooth/l2cap.h
1f1130aab000c5fe002432b93633ea677121cdcf 23-Apr-2009 Jean-Baptiste Queru <jbq@google.com> Merge donut into master
02e9d84ff8239248f72add3ac11b0369c1da6405 29-Mar-2009 The Android Open Source Project <initial-contribution@android.com> Merge branch 'open_source_no_contributions' into google_internal
36af3080c1d3d61969a461bb95c56b0f347bf554 27-Mar-2009 The Android Open Source Project <initial-contribution@android.com> Merge commit 'korg/cupcake'
df782f29a530d805c13f32bb43883306c05a4504 19-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@140373
luedroid/bluetooth.c
81df8cccc299b7c8e120dcc6ac2fbe2b8541a02f 18-Mar-2009 Jean-Baptiste Queru <jbq@google.com> Merge commit 'remotes/korg/cupcake' into merge
aca2845d2be375190b3738672b25997516cbb48d 09-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@137197
luedroid/Android.mk
luez-clean-headers/bluetooth/bluetooth.h
luez-clean-headers/bluetooth/hci.h
luez-clean-headers/bluetooth/hci_lib.h
luez-clean-headers/bluetooth/rfcomm.h
luez-clean-headers/bluetooth/sco.h
7342a3e6a751116a193ff27d69b87eda478a5016 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ndroid.mk
luedroid/Android.mk
luedroid/bluetooth.c
luedroid/bttest.c
luedroid/include/bluedroid/bluetooth.h
rfpatch/Android.mk
rfpatch/brfpatch.c
ata/Android.mk
ata/audio.conf
ata/hcid.conf
ata/input.conf
3b66af0035a864575005ee14c7ea13d502b8e62f 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ndroid.mk
luedroid/Android.mk
luedroid/bluetooth.c
luedroid/bttest.c
luedroid/include/bluedroid/bluetooth.h
rfpatch/Android.mk
rfpatch/brfpatch.c
ata/Android.mk
ata/audio.conf
ata/hcid.conf
ata/input.conf
57102a0135f9a82d97e9e60183ad74daa6448fad 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@132589
luedroid/bluetooth.c
78266b3169fedd14217fe68ecb5bc6a4513b280c 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@137055
luedroid/bluetooth.c
36658369459e22152cce54bd1c0660d71a270947 19-Dec-2008 Jean-Baptiste Queru <jbq@google.com> Merge commit 'remotes/korg/cupcake'

Conflicts:
bluedroid/bluetooth.c
c5c872f46dd2708677c487f190feef24c46ebd88 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
ndroid.mk
luedroid/Android.mk
luedroid/bluetooth.c
luedroid/bttest.c
ata/Android.mk
ata/audio.conf
ata/hcid.conf
ata/input.conf
642e3749b5b2121173cd9c26c8c1fadbe9b59aa1 25-Nov-2008 Nick Pelly <npelly@google.com> Add include path to build libbluedroid.

This fixes the build when BOARD_HAVE_BLUETOOTH := true

Signed-off-by: Nick Pelly <npelly@google.com>
luedroid/Android.mk
8d0bab7a2a4620d64706f55144efd73ded74abdf 13-Nov-2008 Nick Pelly <npelly@google.com> Use the rfkill kernel API to power up/down bluetooth.
luedroid/bluetooth.c
6c2d13d0c3a4505fdac56ae8d537a68218e072f1 21-Oct-2008 The Android Open Source Project <initial-contribution@android.com> Initial Contribution
luedroid/Android.mk
luedroid/bluetooth.c
luedroid/bttest.c
luedroid/include/bluedroid/bluetooth.h
rfpatch/Android.mk
rfpatch/brfpatch.c