summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* Merge "Use audio_in_acoustics_t consistently"Glenn Kasten2012-02-034-6/+6
|\
| * Use audio_in_acoustics_t consistentlyGlenn Kasten2012-01-274-6/+6
* | Merge "Use ToneGenerator::tone_type consistently"Glenn Kasten2012-02-032-3/+5
|\ \
| * | Use ToneGenerator::tone_type consistentlyGlenn Kasten2012-01-272-3/+5
| |/
* | Use NULL not 0 for raw pointersGlenn Kasten2012-02-033-25/+25
* | Merge "For performance, return large objects by reference"Glenn Kasten2012-02-032-8/+8
|\ \
| * | For performance, return large objects by referenceGlenn Kasten2012-01-302-8/+8
* | | Merge "No need to check a wp<> for 0 before promote()"Glenn Kasten2012-02-031-14/+8
|\ \ \
| * | | No need to check a wp<> for 0 before promote()Glenn Kasten2012-01-271-14/+8
| |/ /
* | | Constructor initialization and const fieldsGlenn Kasten2012-02-033-53/+72
* | | Merge "Cleanup thread types"Glenn Kasten2012-02-032-22/+25
|\ \ \
| * | | Cleanup thread typesGlenn Kasten2012-01-262-22/+25
* | | | Merge "Make AudioTrack control block volume field private"Glenn Kasten2012-02-031-4/+3
|\ \ \ \
| * | | | Make AudioTrack control block volume field privateGlenn Kasten2012-01-201-4/+3
* | | | | Merge "Fix const sp<>& in parameter list and return value"Glenn Kasten2012-02-022-4/+4
|\ \ \ \ \
| * | | | | Fix const sp<>& in parameter list and return valueGlenn Kasten2012-01-302-4/+4
| | |_|/ / | |/| | |
* | | | | Unconditional deleteGlenn Kasten2012-01-273-14/+13
|/ / / /
* | | | Merge "Use audio_source_t consistently"Glenn Kasten2012-01-272-3/+7
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use audio_source_t consistentlyGlenn Kasten2012-01-262-3/+7
* | | | Merge "AudioStreamIn and AudioStreamOut"Glenn Kasten2012-01-272-9/+15
|\ \ \ \
| * | | | AudioStreamIn and AudioStreamOutGlenn Kasten2012-01-262-9/+15
| | |_|/ | |/| |
* | | | Merge "Declare methods in binder opcode order"Glenn Kasten2012-01-272-10/+10
|\ \ \ \
| * | | | Declare methods in binder opcode orderGlenn Kasten2012-01-262-10/+10
| | |/ / | |/| |
* | | | Merge "Use enum effect_state consistently"Glenn Kasten2012-01-271-3/+3
|\ \ \ \
| * | | | Use enum effect_state consistentlyGlenn Kasten2012-01-261-3/+3
| | |/ / | |/| |
* | | | Merge "Use enum track_state consistently"Glenn Kasten2012-01-272-3/+3
|\ \ \ \
| * | | | Use enum track_state consistentlyGlenn Kasten2012-01-262-3/+3
| |/ / /
* | | | Use enum mixer_state consistentlyGlenn Kasten2012-01-262-8/+8
|/ / /
* | | am 535b0264: am 7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic"...Eric Laurent2012-01-251-3/+6
|\ \ \ | |/ / |/| |
| * | am 7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1Eric Laurent2012-01-241-3/+6
| |\ \
| | * | AudioFlinger: refine mixer sleep time logicEric Laurent2012-01-231-3/+6
| * | | am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only...Eric Laurent2012-01-242-6/+21
| |\ \ \ | | |/ /
| | * | DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (...Eric Laurent2012-01-232-6/+21
| * | | am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when re...Justin Ho2012-01-232-21/+6
| |\ \ \ | | |/ /
| | * | DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"Justin Ho2012-01-232-21/+6
| * | | am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"Jean-Baptiste Queru2012-01-192-5/+5
| |\ \ \
| | * | | Rename LOG_ASSERT to ALOG_ASSERTSteve Block2012-01-192-5/+5
| * | | | am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"Jean-Baptiste Queru2012-01-198-72/+72
| |\ \ \ \ | | |/ / /
| | * | | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)Steve Block2012-01-198-72/+72
| * | | | am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"Jean-Baptiste Queru2012-01-195-73/+73
| |\ \ \ \ | | |/ / /
| | * | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)Steve Block2012-01-195-73/+73
| * | | | am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"Jean-Baptiste Queru2012-01-194-9/+9
| |\ \ \ \ | | |/ / /
| | * | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)Steve Block2012-01-194-9/+9
| * | | | am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"Jean-Baptiste Queru2012-01-196-17/+17
| |\ \ \ \ | | |/ / /
| | * | | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)Steve Block2012-01-196-17/+17
| * | | | Merge ee4618bcJean-Baptiste Queru2012-01-196-228/+228
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)Steve Block2012-01-196-228/+228
* | | | Remove AudioFlinger dependencies on clientGlenn Kasten2012-01-202-7/+10
| |_|/ |/| |
* | | Use audio_format_t consistently, continuedGlenn Kasten2012-01-204-46/+46
* | | Merge "Add ANativeWindow timestamp support to camera service."Eino-Ville Talvala2012-01-201-0/+7
|\ \ \