summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-04-09Add liblogHEADandroid-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1tools_r22.2mastermainjb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devYing Wang
Bug: 8580410 Change-Id: Iddde0e2eaaf2291d9ba30cf989be7613f604652a
2012-08-17am 8d2fef3f: am 658c9872: Merge "host modules don\'t need LOCAL_MODULE_TAGS"Joe Onorato
* commit '8d2fef3fa40e01380774f47fb5741c0ad4d5a93a': host modules don't need LOCAL_MODULE_TAGS
2012-08-17am 658c9872: Merge "host modules don\'t need LOCAL_MODULE_TAGS"android-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1tools_r22jb-mr1.1-releasejb-mr1.1-dev-plus-aospjb-mr1.1-devjb-mr1-releasejb-mr1-dev-plus-aospjb-mr1-devJoe Onorato
* commit '658c98723518f124ea534d022ef7ed8fc7c68f33': host modules don't need LOCAL_MODULE_TAGS
2012-08-16Merge "host modules don't need LOCAL_MODULE_TAGS"tools_r21Joe Onorato
2012-07-31host modules don't need LOCAL_MODULE_TAGSJoe Onorato
Change-Id: I054e1c63144166be3a94c47f7a0763ce3a9e516a
2012-07-26Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-devEd Heyl
2012-07-21host modules don't need LOCAL_MODULE_TAGSJoe Onorato
Change-Id: I054e1c63144166be3a94c47f7a0763ce3a9e516a
2012-07-17bluetooth: recognize BOARD_BLUETOOTH_USES_HCIATTACH_PROPERTYjeonghoon.lim
Break out top-level define BLUETOOTH_HCIATTACH_USING_PROPERTY under its own board-level config option. Change-Id: I51e8d1d4baffe72b861d6f616910452525c8a589
2012-07-16bluetooth: bring upjeonghoon.lim
refactoring the code for other bluetooth module which don't use rfkill and hciattach service Change-Id: Ide420540b398bcc63e19bb7ab0cc0d3f94d5987a
2012-07-11Merge "Fix the timeout in bt_enable."Elliott Hughes
2012-07-11Fix the timeout in bt_enable.Elliott Hughes
1000 * 100ms == 100s, not 10s. This means my AOSP maguro takes 100s to start system_server, which is a very long time to stare at a blank screen. The intended 10s is perfectly reasonable; we're doing useful work in parallel for most of that time anyway. I've also made the logging more like the other logging in this file: bluedroid: bt_enable: ioctl(248, HCIDEVUP, HCI_DEV_ID) failed: No such device (19) Change-Id: I8321bfed380720e57c43f2f94569ab4f983685f3
2012-05-16Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project
Change-Id: Iba78ea27bcf56a64b7cbe9eae6d81291e6dd81e9
2012-04-03Merge remote-tracking branch 'goog/ics-aah'android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1jb-devMike Lockwood
2012-02-01am c748435d: am df7d9be0: Reconcile with ics-mr1-releaseThe Android Open Source Project
* commit 'c748435d4d0cb8477d96fc8b49e8f92ec50a254f':
2012-02-01am df7d9be0: Reconcile with ics-mr1-releaseThe Android Open Source Project
* commit 'df7d9be0cf5584b544fa94cbca57b797f1e8c2c1':
2012-02-01Reconcile with ics-mr1-releaseThe Android Open Source Project
Change-Id: I13d2f8f34dec84ac0cf8296e3e10e9f33c88cc40
2012-01-12merge in ics-release history after reset to masterandroid-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1jb-releasejb-mr0-releaseThe Android Automerger
2012-01-12Fix build warning for strtoulGlenn Kasten
Change-Id: I47fc5e9f932869026609ac2430674aabe9afb6ec
2012-01-10merge in ics-release history after reset to masterThe Android Automerger
2012-01-09merge in ics-release history after reset to masterThe Android Automerger
2012-01-06Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block
See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Id297c768e26290752c1accd2110d10437a73920e
2012-01-05Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block
See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I3216dd68b93e8e407f4416f8d42b3972d4234eff
2012-01-05merge in ics-release history after reset to masterThe Android Automerger
2012-01-04Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block
See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: Idbc346256880a8456b70074f930dc02e3c8d085d
2012-01-03Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block
See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: Ic08ff7c6b62e4c5cdccd8f446d7c0aa0e0a6cf30
2011-12-09am 9109c420: Reconcile with ics-mr1-releaseThe Android Open Source Project
* commit '9109c4206e5891746e6a5f77a80c7edf4ce9a8e5':
2011-12-08Reconcile with ics-mr1-releaseandroid-sdk-adt_r20android-3.2.6_r1tools_r20ics-plus-aospThe Android Open Source Project
Change-Id: Ic3ab1dc8924cb9a64bbc0e90e421fa79507ea821
2011-11-04Reconcile with ics-mr1-releaseThe Android Open Source Project
Change-Id: Id2458bb7c9fe5f11a0ca6ba498189222bba34b85
2011-11-02merge in ics-release history after reset to masterThe Android Automerger
2011-11-01am 62432dd0: Check EALREADY status for HCIDEVUP commandMatthew Xie
* commit '62432dd0bb4d59f640bde9309f86eef2fd984f18': Check EALREADY status for HCIDEVUP command
2011-11-01merge in ics-mr1-release history after reset to ics-mr1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1ics-mr1-releaseThe Android Automerger
2011-10-31am 62432dd0: Check EALREADY status for HCIDEVUP commandMatthew Xie
* commit '62432dd0bb4d59f640bde9309f86eef2fd984f18': Check EALREADY status for HCIDEVUP command
2011-10-31Reconcile with ics-mr1-releaseThe Android Open Source Project
Change-Id: Ic5558be740f41bea77be44b65f3da9dc490d9948
2011-10-28keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl
2011-10-27Check EALREADY status for HCIDEVUP commandandroid-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0.3_r2android-cts-4.0.3_r1ics-mr1Matthew Xie
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
2011-10-26undo reset to ics-mr1 until we have a better methodEd Heyl
2011-10-26reset to ics-mr1, but keep historyEd Heyl
2011-10-26merge in ics-release history after reset to masterThe Android Automerger
2011-10-26am c7be2810: (-s ours) Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGESteve Block
* commit 'c7be2810d52c07f8cff574c93166a02f3c14d878': Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
2011-10-25Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGESteve Block
See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I5930d10c195bff60dd34fdf3ed7f0af7414f0e3b
2011-10-23merge in ics-release history after reset to masterThe Android Automerger
2011-10-20Bluetooth: Add BMW MINI10013 in blacklistChunho Park
-To avoid repeated attempts error. Change-Id: I28ba4894bf4a8063cea8407d193356f8c27da7b3 Signed-off-by: Chunho Park <chun.ho.park@samsung.com>
2011-09-11merge in ics-release history after reset to masterThe Android Automerger
2011-09-08Merge "Sync main.confs with that of Bluez"android-sdk-adt_r16.0.1android-cts-4.0_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1ics-mr0-releaseics-mr0ics-factoryrom-2-releaseMatthew Xie
2011-09-08Sync main.confs with that of BluezMatthew Xie
The only change is DiscoverSchedulerInterval changes from 0 to 30 bug 5265282 Change-Id: Iad709d8bb97f939f008b9dbca5b5660547d492b3
2011-09-08Change RememberPowered to falseMatthew Xie
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
2011-08-15merge in ics-release history after reset to masterThe Android Automerger
2011-08-10Change class to handheld from Laptop.Jaikumar Ganesh
This makes it work with digital pens and other devices. Change-Id: Ia0615cdd6713efdeac2da096bbd9cfb84ad8fa67
2011-08-01merge in ics-release history after reset to masterThe Android Automerger
2011-07-29Bluetooth: fix for the unrecoverable state after BT on is failedjhtop.kim
- 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 20:10:07 +0000