summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* Merge "Simplify range check for audio_mode_t"Glenn Kasten2012-01-112-2/+2
|\
| * Simplify range check for audio_mode_tGlenn Kasten2012-01-102-2/+2
* | Merge "Use correct type for hardware call state"Glenn Kasten2012-01-112-2/+2
|\ \
| * | Use correct type for hardware call stateGlenn Kasten2012-01-062-2/+2
* | | Merge "Use consistent style of & reference for AutoMutex"Glenn Kasten2012-01-111-3/+3
|\ \ \
| * | | Use consistent style of & reference for AutoMutexGlenn Kasten2012-01-061-3/+3
| |/ /
* | | Merge "AudioFlinger new can't fail"Glenn Kasten2012-01-111-2/+1
|\ \ \
| * | | AudioFlinger new can't failGlenn Kasten2012-01-061-2/+1
| |/ /
* | | Merge "Fix build warning"Glenn Kasten2012-01-111-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix build warningGlenn Kasten2012-01-061-1/+1
| |/
* | Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGESteve Block2012-01-093-6/+6
* | Merge "By convention const goes before the type specifier"Glenn Kasten2012-01-095-23/+24
|\ \
| * | By convention const goes before the type specifierGlenn Kasten2012-01-065-23/+24
| |/
* | Use cached reference to media.player serviceGlenn Kasten2012-01-091-5/+4
* | Merge "Replace loop by __builtin_ctz"Glenn Kasten2012-01-091-9/+4
|\ \
| * | Replace loop by __builtin_ctzGlenn Kasten2012-01-051-9/+4
| |/
* | Merge "suspended() and isSuspended() are const"Glenn Kasten2012-01-092-4/+5
|\ \
| * | suspended() and isSuspended() are constGlenn Kasten2012-01-052-4/+5
| |/
* | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-088-76/+76
* | am 4bc873e6: am 7944704e: Merge "Switch camera sounds to always use the syste...Eino-Ville Talvala2012-01-062-12/+1
|\ \
| * | Switch camera sounds to always use the system enforced audio stream.Eino-Ville Talvala2012-01-062-12/+1
* | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-065-73/+73
* | | Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"Steve Block2012-01-054-9/+9
|\ \ \
| * | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-044-9/+9
* | | | Merge "Remove the notion of "active track" from mixer"Glenn Kasten2012-01-053-81/+89
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove the notion of "active track" from mixerGlenn Kasten2011-12-203-81/+89
* | | | Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros"Glenn Kasten2012-01-054-45/+36
|\ \ \ \
| * | | | Use the standard CC_LIKELY and CC_UNLIKELY macrosGlenn Kasten2012-01-054-45/+36
* | | | | resolved conflicts for merge of 1a4b9939 to masterEric Laurent2012-01-044-1/+30
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | audioflinger: fix clicks on 48kHz audio.Eric Laurent2011-12-224-1/+30
* | | | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-036-17/+17
| |/ / |/| |
* | | Merge "Remove dead code"Glenn Kasten2011-12-202-5/+4
|\ \ \ | |_|/ |/| |
| * | Remove dead codeGlenn Kasten2011-12-192-6/+4
* | | Merge "audio effects: rename configure command"Eric Laurent2011-12-191-1/+1
|\ \ \
| * | | audio effects: rename configure commandEric Laurent2011-12-191-1/+1
* | | | Merge "Use constants for 2 and 32"Glenn Kasten2011-12-162-8/+8
|\ \ \ \
| * | | | Use constants for 2 and 32Glenn Kasten2011-12-162-8/+8
* | | | | Merge "Extract out audio DSP code to utility library"Glenn Kasten2011-12-164-117/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Extract out audio DSP code to utility libraryGlenn Kasten2011-12-164-117/+10
| | |/ / | |/| |
* | | | Merge "Use switch in AudioMixer::setParameter"Glenn Kasten2011-12-162-36/+49
|\ \ \ \
| * | | | Use switch in AudioMixer::setParameterGlenn Kasten2011-12-162-36/+49
* | | | | deleteTrackName now asserts on bad input parameterGlenn Kasten2011-12-161-17/+16
|/ / / /
* | | | Merge "setActiveTrack and setBufferProvider can't fail"Glenn Kasten2011-12-162-10/+9
|\ \ \ \
| * | | | setActiveTrack and setBufferProvider can't failGlenn Kasten2011-12-152-10/+9
| |/ / /
* | | | Merge "Simplify enable/disable mixing"Glenn Kasten2011-12-163-30/+15
|\ \ \ \
| * | | | Simplify enable/disable mixingGlenn Kasten2011-12-153-30/+15
| |/ / /
* | | | Merge "Improve resistance to leaks for ConfigEvent"Glenn Kasten2011-12-152-8/+7
|\ \ \ \
| * | | | Improve resistance to leaks for ConfigEventGlenn Kasten2011-12-152-8/+7
| |/ / /
* | | | Merge "Use NULL not 0 for pointers"Glenn Kasten2011-12-153-29/+29
|\ \ \ \ | |_|/ / |/| | |
| * | | Use NULL not 0 for pointersGlenn Kasten2011-12-153-29/+29
| |/ /