summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '9d3950389b53452338fab25f2255623ac159b259' into HEADidea133The Android Open Source Project2013-12-053-8/+83
|\
| * am 18fc094c: Define and use DRC-specific volume curves when applicableJean-Michel Trivi2013-11-153-3/+41
| |\
| | * Define and use DRC-specific volume curves when applicableandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-4.4w_r1android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-wearkitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devJean-Michel Trivi2013-11-143-3/+41
| * | am 376356d4: Merge "audio: do not use GNU old-style field designators"Nick Kralevich2013-11-061-12/+12
| |\ \
| * \ \ am 2c14d798: Merge "Revert "audio: do not use GNU old-style field designators""Elliott Hughes2013-11-061-12/+12
| |\ \ \
| * \ \ \ am 636ab7e2: Merge "audio: do not use GNU old-style field designators"Nick Kralevich2013-11-061-12/+12
| |\ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge "audio policy: fix gapless playback when effects enabled" into klp-devEric Laurent2013-10-302-5/+42
| |\ \ \ \
| | * | | | audio policy: fix gapless playback when effects enabledEric Laurent2013-10-142-5/+42
* | | | | | Merge "wifi: Link libwpa_client only if wpa_supplicant was chosen"Ying Wang2013-12-053-7/+29
|\ \ \ \ \ \
| * | | | | | wifi: Link libwpa_client only if wpa_supplicant was chosenDmitry Shmidt2013-12-053-7/+29
|/ / / / / /
* | | | | / Merge commit 'c0ff7762509131a5a95ee258fa6da881a23100a6' into HEADThe Android Open Source Project2013-11-2214-315/+652
|\| | | | | | |_|_|_|/ |/| | | |
| * | | | merge in klp-release (no-op)android-cts-4.4_r1kitkat-cts-devEd Heyl2013-10-160-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | merge in klp-release history after reset to klp-devandroid-cts-4.4_r4android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9kitkat-releasekitkat-cts-releaseThe Android Automerger2013-10-080-0/+0
| |/| | |
| | * | | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-060-0/+0
| | |\ \ \
| | | * \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-10-020-0/+0
| | | |\ \ \
| | | | * | | audio: fix remote submix sampling ratesEric Laurent2013-09-261-2/+2
| * | | | | | audio policy: fix direct output selectionEric Laurent2013-10-071-46/+45
| |/ / / / /
| * / / / / audio policy: fix DTMF tones volume while in callEric Laurent2013-10-031-1/+11
| |/ / / /
| * | | | remove audio HAL warning when inserting a headsetEric Laurent2013-09-301-1/+7
| * | | | audio: fix remote submix sampling ratesEric Laurent2013-09-261-2/+2
| |/ / /
| * | | audio policy: add support for audio effect offloadandroid-4.4_r0.8Eric Laurent2013-09-172-21/+68
| * | | Merge "AudioPolicyManageBase changes to enable HOTWORD audio source" into klp...android-4.4_r0.7Eric Laurent2013-09-121-8/+22
| |\ \ \
| | * | | AudioPolicyManageBase changes to enable HOTWORD audio sourceEric Laurent2013-09-091-8/+22
| * | | | audio policy: extend min duration for offloadEric Laurent2013-09-091-1/+1
| |/ / /
| * | | audio policy: remove verbose logging.Eric Laurent2013-08-301-1/+1
| * | | audio policy: disable audio offloading with videoEric Laurent2013-08-301-2/+9
| * | | audio policy: allow virtual input even if there are active inputsChong Zhang2013-08-241-1/+1
| * | | Automatically enable/disable remote submix when input started.Jeff Brown2013-08-192-1/+32
| * | | Use a single socket to communicate with supplicantVinit Deshapnde2013-08-082-151/+80
| * | | Code changes for audio offload supportRichard Fitzgerald2013-07-245-50/+116
| * | | am 4c7db154: (-s ours) Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-160-0/+0
| |\ \ \
| * \ \ \ am 8e7e4254: am e92d6238: audio policy: apply default device volumeEric Laurent2013-07-151-1/+1
| |\ \ \ \
| * | | | | wifi: Sync with wpa_supplicant commit 1075b29Dmitry Shmidt2013-07-121-0/+5
| * | | | | Include header files used by this headerGlenn Kasten2013-07-021-0/+1
| * | | | | Add audio policy API changes for audio offloadRichard Fitzgerald2013-06-276-11/+43
| * | | | | am 248c9aa9: am 2769ce79: Merge "Use accessor to read property serial numbers"Colin Cross2013-06-170-0/+0
| |\ \ \ \ \
| * | | | | | Use accessor to read property serial numbersColin Cross2013-06-141-2/+2
| * | | | | | wifi: Move common file from wpa_supplicant_libDmitry Shmidt2013-06-061-0/+197
| * | | | | | wifi: Skip adding interface prefix if existsDmitry Shmidt2013-06-061-6/+8
| * | | | | | wifi: Use global control socketDmitry Shmidt2013-06-031-16/+46
| * | | | | | wifi: Add command buffer length parameter to wifi_command()Dmitry Shmidt2013-05-302-3/+6
| * | | | | | wifi: Use wpa_ctrl_cleanup() function from wpa_supplicantDmitry Shmidt2013-05-222-44/+2
| * | | | | | am 66707435: audio policy: fix device selection in startInput()Eric Laurent2013-05-211-0/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am a776ffd2: Rewrite an invalid config fileIrfan Sheriff2013-04-121-26/+35
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am e5d72df1: Add liblogYing Wang2013-04-092-2/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 5a950c96: audio policy: reuse direct output when possibleEric Laurent2013-04-042-11/+37
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 80f5b040: audio policy: fix music glitch when starting callEric Laurent2013-03-262-72/+76
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 58d6b9eb: (-s ours) am 10f06dc0: am 0b904fda: am 93bb0058: am 4bcc1fdb: (-...Jean-Baptiste Queru2013-03-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge "audio: do not use GNU old-style field designators"Nick Kralevich2013-11-071-12/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | audio: do not use GNU old-style field designatorssynergy dev2013-11-061-12/+12
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |