aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-06-07Reconcile with jb-releaseHEADtools_r21mastermainics-plus-aospThe Android Open Source Project
Change-Id: Iab107a271cf41d0a65e2ae7e91880f9eb8036c74
2012-06-06merge in jb-release history after reset to jb-devandroid-4.1_pre2android-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_r1android-4.1-sdk_pre1jb-releasejb-mr0-releaseThe Android Automerger
2012-06-05am e73c02b4: Don\'t return a fallback value for Alias property of BT device.Jake Hamby
* commit 'e73c02b4397b97f6bc5b7fd862ca3babf18da497': Don't return a fallback value for Alias property of BT device.
2012-06-05Don't return a fallback value for Alias property of BT device.android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1jb-devJake Hamby
When getting properties for a Bluetooth device, or getting info about a newly discovered device, do not set the Alias property to the device name or to the Bluetooth address as a fallback. The Alias property will only be set if the user has actually set a custom alias for the device. Bug: 5346926 Change-Id: Iea51b642592fae066ab075b0fe46d255f2d73119
2012-05-16Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project
Change-Id: I4a18c51a81818830e242211ee464aef0e961b0b4
2012-04-18merge in jb-release history after reset to masterandroid-4.1_pre1The Android Automerger
2012-04-17fix gpl buildEric Laurent
Change-Id: Ia1dfb030383384813c6f5780f5e83967c7d21a23
2012-04-17audio: update to new audio HAL device API.Eric Laurent
Change-Id: Iba0802f8d03bc57ecf32736f5eb8beb59ac56f39
2012-04-04merge in jb-release history after reset to masterThe Android Automerger
2012-04-03Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood
2012-04-03send extra UUID property change notifications to help the upper layers ↵Travis Geiselbrecht
change state In the scenario where there are no plugins loaded, bluez initializes and finishes putting the adapter in a powered down state before the upper layers have a chance of finishing their initialization. By duplicately sending UUID property changes, the upper layer notices and moves to the next state. Change-Id: I673cfb95444d1fee12264e50c709f85a40480068
2012-03-21am 7e510deb: am 0733e2a9: Reconcile with ics-mr1-releaseThe Android Open Source Project
* commit '7e510deb2f00c60a435869fd46cc71c2608f42d4':
2012-03-21am 0733e2a9: Reconcile with ics-mr1-releaseThe Android Open Source Project
* commit '0733e2a9f7d1d2437bd750421d63a627fe7af810':
2012-03-21Reconcile with ics-mr1-releaseThe Android Open Source Project
Change-Id: I0ea309b126d5d27d24e26ad3c73dc4cca88eee8c
2012-03-21am f868dc27: am 5477d33e: Reconcile with ics-mr1-releaseThe Android Open Source Project
* commit 'f868dc272b14b516daa5a144bd689b418acba599':
2012-03-21am 5477d33e: Reconcile with ics-mr1-releaseThe Android Open Source Project
* commit '5477d33e187d66961453399c53093bd18297013e':
2012-03-21Reconcile with ics-mr1-releaseandroid-sdk-adt_r20android-3.2.6_r1tools_r20The Android Open Source Project
Change-Id: Idb595648ee6ea6cb5f690f554d40f458902f65ac
2012-03-20am 0809d6c1: am b739b67a: am 11db147d: audio: fix wrong latency reported by ↵Eric Laurent
audio HAL * commit '0809d6c13b38c71bd0394173ad38cd0325d96cd3':
2012-03-20am 54f29272: am 343ec8cd: am 11db147d: audio: fix wrong latency reported by ↵Eric Laurent
audio HAL * commit '54f292720e41afa7ef66ce7d19ff12521f003706': audio: fix wrong latency reported by audio HAL
2012-03-16merge 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_r1ics-mr1-releaseThe Android Automerger
2012-03-16am b739b67a: am 11db147d: audio: fix wrong latency reported by audio HALEric Laurent
* commit 'b739b67a1e6a573b5da924aa601fd87faec3a02d':
2012-03-16am 343ec8cd: am 11db147d: audio: fix wrong latency reported by audio HALEric Laurent
* commit '343ec8cd344e9bdac78cc2a15468aee65e2af452': audio: fix wrong latency reported by audio HAL
2012-03-16am 11db147d: audio: fix wrong latency reported by audio HALEric Laurent
* commit '11db147d66fb1339054414318d13f090d6905e77': audio: fix wrong latency reported by audio HAL
2012-03-16am 11db147d: audio: fix wrong latency reported by audio HALandroid-4.0.4-aah_r1ics-aah-releaseEric Laurent
* commit '11db147d66fb1339054414318d13f090d6905e77': audio: fix wrong latency reported by audio HAL
2012-03-16am 11db147d: audio: fix wrong latency reported by audio HALEric Laurent
* commit '11db147d66fb1339054414318d13f090d6905e77': audio: fix wrong latency reported by audio HAL
2012-03-16audio: fix wrong latency reported by audio HALics-mr1Eric Laurent
Commit 355afe9a broke the calculation of the latency returned by A2DP, leading to incorrect A/V sync. The latency must take into account the intermediate buffering added in audio HAL. Change-Id: I1f3d7494fe58517151c5dba0a4883f583d7a6ef2
2012-03-12merge in jb-release history after reset to masterThe Android Automerger
2012-03-08fix GPL buildEric Laurent
Change-Id: Iab79133bf1045a51e5f8fa97f0c60765ee02fbe9
2012-03-07audio: use common string for A2DP sink addressEric Laurent
Use definition from audio.h for A2DP sink address parameter. Change-Id: I18119acc6579b9fed6b2f8cf390bbbab1d5b5e46
2012-03-07merge in jb-release history after reset to masterThe Android Automerger
2012-03-06send extra UUID property change notifications to help the upper layers ↵Travis Geiselbrecht
change state In the scenario where there are no plugins loaded, bluez initializes and finishes putting the adapter in a powered down state before the upper layers have a chance of finishing their initialization. By duplicately sending UUID property changes, the upper layer notices and moves to the next state. Change-Id: I673cfb95444d1fee12264e50c709f85a40480068
2012-03-05audio: fix wrong latency reported by audio HALEric Laurent
Commit 355afe9a broke the calculation of the latency returned by A2DP, leading to incorrect A/V sync. The latency must take into account the intermediate buffering added in audio HAL. Change-Id: I1f3d7494fe58517151c5dba0a4883f583d7a6ef2
2012-02-01am 0517b672: am 31e54ebd: Reconcile with ics-mr1-releaseThe Android Open Source Project
* commit '0517b6721e69d963c3c1dd06b65f5090a34e4b5f':
2012-02-01am 31e54ebd: Reconcile with ics-mr1-releaseThe Android Open Source Project
* commit '31e54ebdc47e2d07bf7923dd2003be8440f827a6':
2012-02-01Reconcile with ics-mr1-releaseThe Android Open Source Project
Change-Id: I16b26450c0def0dbea7c50d37d74a15cbb9ba93a
2012-01-23merge in ics-release history after reset to masterThe Android Automerger
2012-01-20Merge "Use audio_format_t consistently"Glenn Kasten
2012-01-18merge in ics-release history after reset to masterThe Android Automerger
2012-01-13Use audio_mode_t consistentlyGlenn Kasten
Change-Id: Icc0048b165032366a035d35e79a5887dccab8c73
2012-01-13Use audio_format_t consistentlyGlenn Kasten
Change-Id: I6c64429f93c595df264138a668a91916e7bcec66
2012-01-10merge 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: I5d70c4def17fb904e39bbbca6b807dfa71b45bd9
2012-01-05am d79e6842: Reconcile with ics-mr1-releaseThe Android Open Source Project
* commit 'd79e684287ccf6673e251458c0ad571af8c86611':
2012-01-05Reconcile with ics-mr1-releaseThe Android Open Source Project
Change-Id: I6d002b3cda46acfe66db3b07a349aac8cb6be003
2012-01-05merge in ics-release history after reset to masterThe Android Automerger
2012-01-04merge in ics-mr1-release history after reset to ics-mr1The Android Automerger
2012-01-04am cbdef4bc: am 05675015: a2dp audio HAL: extend write timeout.Eric Laurent
* commit 'cbdef4bcda666239af9a2c77fd92e42d85160c65': a2dp audio HAL: extend write timeout.
2012-01-04am 05675015: a2dp audio HAL: extend write timeout.Eric Laurent
* commit '05675015d13729f7da5bf32c88264c68e02d6028': a2dp audio HAL: extend write timeout.
2012-01-04am 05675015: a2dp audio HAL: extend write timeout.Eric Laurent
* commit '05675015d13729f7da5bf32c88264c68e02d6028': a2dp audio HAL: extend write timeout.
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: I2aa130ef94576887d8a88eaa42cc0f26ce7411b0