Permalink
Switch branches/tags
android-sdk-support_r11 android-sdk-adt_r20 android-sdk-adt_r16.0.1 android-sdk-4.0.3_r1 android-sdk-4.0.3-tools_r1 android-cts-verifier-4.0.3_r1 android-cts-verifier-4.0_r1 android-cts-4.2_r2 android-cts-4.2_r1 android-cts-4.1_r4 android-cts-4.1_r2 android-cts-4.1_r1 android-cts-4.0.3_r2 android-cts-4.0.3_r1 android-cts-4.0_r1 android-cts-2.3_r12 android-cts-2.3_r11 android-cts-2.3_r10 android-cts-2.2_r8 android-4.3.1_r1 android-4.3_r3.1 android-4.3_r3 android-4.3_r2.3 android-4.3_r2.2 android-4.3_r2.1 android-4.3_r2 android-4.3_r1.1 android-4.3_r1 android-4.3_r0.9.1 android-4.3_r0.9 android-4.2.2_r1.2 android-4.2.2_r1.1 android-4.2.2_r1 android-4.2.1_r1.2 android-4.2.1_r1.1 android-4.2.1_r1 android-4.2_r1 android-4.1.2_r2.1 android-4.1.2_r2 android-4.1.2_r1 android-4.1.1_r6.1 android-4.1.1_r6 android-4.1.1_r5 android-4.1.1_r4 android-4.1.1_r3 android-4.1.1_r2 android-4.1.1_r1.1 android-4.1.1_r1 android-4.0.4_r2.1 android-4.0.4_r2 android-4.0.4_r1.2 android-4.0.4_r1.1 android-4.0.4_r1 android-4.0.3_r1.1 android-4.0.3_r1 android-4.0.2_r1 android-4.0.1_r1.2 android-4.0.1_r1.1 android-4.0.1_r1 android-3.2.6_r1 android-3.2.4_r1 android-3.2.2_r2 android-3.2.2_r1 android-3.2.1_r2 android-3.2.1_r1 android-3.2_r1 android-3.1_r1 android-3.0_r1.3 android-3.0_r1.2 android-3.0_r1.1 android-3.0_r1 android-2.3.7_r1 android-2.3.6_r1 android-2.3.6_r0.9 android-2.3.5_r1 android-2.3.4_r1 android-2.3.4_r0.9 android-2.3.3_r1.1 android-2.3.3_r1 android-2.3.2_r1 android-2.3.1_r1 android-2.3_r1 android-2.2.3_r2.1 android-2.2.3_r2 android-2.2.3_r1 android-2.2.2_r1 android-2.2.1_r2 android-2.2.1_r1 android-2.2_r1.3 android-2.2_r1.2 android-2.2_r1.1 android-2.2_r1 android-2.1_r2.1s android-2.1_r2.1p2 android-2.1_r2.1p android-2.1_r2 android-2.1_r1 android-2.0.1_r1 android-2.0_r1 android-1.6_r2
Nothing to show
Commits on Apr 10, 2013
  1. Add liblog

    Bug: 8580410
    Change-Id: Iddde0e2eaaf2291d9ba30cf989be7613f604652a
    wangying1015 committed Apr 10, 2013
Commits on Aug 17, 2012
  1. am 8d2fef3: am 658c987: Merge "host modules don\'t need LOCAL_MODULE_…

    …TAGS"
    
    * commit '8d2fef3fa40e01380774f47fb5741c0ad4d5a93a':
      host modules don't need LOCAL_MODULE_TAGS
    Joe Onorato committed with Android Git Automerger Aug 17, 2012
  2. am 658c987: Merge "host modules don\'t need LOCAL_MODULE_TAGS"

    * commit '658c98723518f124ea534d022ef7ed8fc7c68f33':
      host modules don't need LOCAL_MODULE_TAGS
    Joe Onorato committed with Android Git Automerger Aug 17, 2012
  3. Merge "host modules don't need LOCAL_MODULE_TAGS"

    Joe Onorato committed with android code review Aug 17, 2012
Commits on Aug 1, 2012
  1. host modules don't need LOCAL_MODULE_TAGS

    Change-Id: I054e1c63144166be3a94c47f7a0763ce3a9e516a
    Joe Onorato committed May 19, 2012
Commits on Jul 26, 2012
Commits on Jul 21, 2012
  1. host modules don't need LOCAL_MODULE_TAGS

    Change-Id: I054e1c63144166be3a94c47f7a0763ce3a9e516a
    Joe Onorato committed May 19, 2012
Commits on Jul 17, 2012
  1. bluetooth: recognize BOARD_BLUETOOTH_USES_HCIATTACH_PROPERTY

    Break out top-level define BLUETOOTH_HCIATTACH_USING_PROPERTY under its own
    board-level config option.
    
    Change-Id: I51e8d1d4baffe72b861d6f616910452525c8a589
    jeonghoon.lim committed with Iliyan Malchev Jul 3, 2012
  2. bluetooth: bring up

    refactoring the code for other bluetooth module which don't use rfkill and hciattach service
    
    Change-Id: Ide420540b398bcc63e19bb7ab0cc0d3f94d5987a
    jeonghoon.lim committed with Brian Muramatsu Jul 3, 2012
Commits on Jul 12, 2012
  1. Merge "Fix the timeout in bt_enable."

    enh committed with android code review Jul 12, 2012
Commits on Jul 11, 2012
  1. Fix the timeout in bt_enable.

    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
    enh committed Jul 11, 2012
Commits on May 16, 2012
  1. Reconcile with jb-release nakasi-factoryrom-release

    Change-Id: Iba78ea27bcf56a64b7cbe9eae6d81291e6dd81e9
    The Android Open Source Project committed May 16, 2012
Commits on Apr 3, 2012
  1. Merge remote-tracking branch 'goog/ics-aah'

    Mike Lockwood committed Apr 3, 2012
Commits on Feb 1, 2012
  1. am c748435: am df7d9be: Reconcile with ics-mr1-release

    * commit 'c748435d4d0cb8477d96fc8b49e8f92ec50a254f':
    The Android Open Source Project committed with Android Git Automerger Feb 1, 2012
  2. am df7d9be: Reconcile with ics-mr1-release

    * commit 'df7d9be0cf5584b544fa94cbca57b797f1e8c2c1':
    The Android Open Source Project committed with Android Git Automerger Feb 1, 2012
  3. Reconcile with ics-mr1-release

    Change-Id: I13d2f8f34dec84ac0cf8296e3e10e9f33c88cc40
    The Android Open Source Project committed Feb 1, 2012
Commits on Jan 12, 2012
  1. merge in ics-release history after reset to master

    The Android Automerger committed Jan 12, 2012
  2. Fix build warning for strtoul

    Change-Id: I47fc5e9f932869026609ac2430674aabe9afb6ec
    Glenn Kasten committed Jan 12, 2012
Commits on Jan 10, 2012
  1. merge in ics-release history after reset to master

    The Android Automerger committed Jan 10, 2012
Commits on Jan 9, 2012
  1. merge in ics-release history after reset to master

    The Android Automerger committed Jan 9, 2012
Commits on Jan 6, 2012
  1. Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

    See https://android-git.corp.google.com/g/#/c/157220
    
    Bug: 5449033
    Change-Id: Id297c768e26290752c1accd2110d10437a73920e
    Steve Block committed Jan 6, 2012
Commits on Jan 5, 2012
  1. Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE

    See https://android-git.corp.google.com/g/157065
    
    Bug: 5449033
    Change-Id: I3216dd68b93e8e407f4416f8d42b3972d4234eff
    Steve Block committed Jan 5, 2012
  2. merge in ics-release history after reset to master

    The Android Automerger committed Jan 5, 2012
Commits on Jan 4, 2012
  1. Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE

    See https://android-git.corp.google.com/g/156801
    
    Bug: 5449033
    Change-Id: Idbc346256880a8456b70074f930dc02e3c8d085d
    Steve Block committed Jan 4, 2012
Commits on Jan 3, 2012
  1. Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE

    See https://android-git.corp.google.com/g/156016
    
    Bug: 5449033
    Change-Id: Ic08ff7c6b62e4c5cdccd8f446d7c0aa0e0a6cf30
    Steve Block committed Dec 20, 2011
Commits on Dec 9, 2011
  1. am 9109c42: Reconcile with ics-mr1-release

    * commit '9109c4206e5891746e6a5f77a80c7edf4ce9a8e5':
    The Android Open Source Project committed with Android Git Automerger Dec 9, 2011
Commits on Dec 8, 2011
  1. Reconcile with ics-mr1-release

    Change-Id: Ic3ab1dc8924cb9a64bbc0e90e421fa79507ea821
    The Android Open Source Project committed Dec 8, 2011
Commits on Nov 4, 2011
  1. Reconcile with ics-mr1-release

    Change-Id: Id2458bb7c9fe5f11a0ca6ba498189222bba34b85
    The Android Open Source Project committed Nov 4, 2011
Commits on Nov 2, 2011
  1. merge in ics-release history after reset to master

    The Android Automerger committed Nov 2, 2011
Commits on Nov 1, 2011
  1. am 62432dd: Check EALREADY status for HCIDEVUP command

    * commit '62432dd0bb4d59f640bde9309f86eef2fd984f18':
      Check EALREADY status for HCIDEVUP command
    Matthew Xie committed with Android Git Automerger Nov 1, 2011
  2. merge in ics-mr1-release history after reset to ics-mr1

    The Android Automerger committed Nov 1, 2011
Commits on Oct 31, 2011
  1. am 62432dd: Check EALREADY status for HCIDEVUP command

    * commit '62432dd0bb4d59f640bde9309f86eef2fd984f18':
      Check EALREADY status for HCIDEVUP command
    Matthew Xie committed with Android Git Automerger Oct 31, 2011
  2. Reconcile with ics-mr1-release

    Change-Id: Ic5558be740f41bea77be44b65f3da9dc490d9948
    The Android Open Source Project committed Oct 31, 2011
Commits on Oct 28, 2011
Commits on Oct 27, 2011
  1. 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
    Matthew Xie committed Oct 27, 2011