Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Remove redundant get()" | Glenn Kasten | 2012-01-20 | 1 | -2/+2 |
|\ | |||||
| * | Remove redundant get() | Glenn Kasten | 2012-01-20 | 1 | -2/+2 |
* | | Merge "Remove dead setRingerMode(mode, mask)" | Glenn Kasten | 2012-01-20 | 2 | -14/+0 |
|\ \ | |||||
| * | | Remove dead setRingerMode(mode, mask) | Glenn Kasten | 2012-01-18 | 2 | -14/+0 |
* | | | resolved conflicts for merge of 05683c85 to master | Eric Laurent | 2012-01-19 | 2 | -6/+21 |
|\ \ \ | |_|/ |/| | | |||||
| * | | AudioFlinger: mix track only when really ready (2) | Eric Laurent | 2012-01-18 | 2 | -6/+21 |
* | | | Merge "Add units to time periods" | Glenn Kasten | 2012-01-19 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Add units to time periods | Glenn Kasten | 2012-01-18 | 1 | -2/+2 |
| | |/ | |/| | |||||
* | | | Merge "Use const const strings for arrays and pointers to strings" | Glenn Kasten | 2012-01-19 | 2 | -4/+4 |
|\ \ \ | |||||
| * | | | Use const const strings for arrays and pointers to strings | Glenn Kasten | 2012-01-18 | 2 | -4/+4 |
| |/ / | |||||
* | | | For booleans, use ! instead of == false | Glenn Kasten | 2012-01-18 | 2 | -5/+5 |
|/ / | |||||
* | | Merge "Track volume cleanup" | Glenn Kasten | 2012-01-18 | 1 | -10/+28 |
|\ \ | |||||
| * | | Track volume cleanup | Glenn Kasten | 2012-01-17 | 1 | -10/+28 |
* | | | Merge "audio framework: manage stream volume per device" | Eric Laurent | 2012-01-17 | 2 | -6/+28 |
|\ \ \ | |/ / |/| | | |||||
| * | | audio framework: manage stream volume per device | Eric Laurent | 2012-01-17 | 2 | -6/+28 |
* | | | Remove dead setVolume() and mVolume[2] | Glenn Kasten | 2012-01-17 | 2 | -15/+0 |
* | | | Merge "Use audio_mode_t consistently" | Glenn Kasten | 2012-01-17 | 4 | -13/+13 |
|\ \ \ | |/ / |/| | | |||||
| * | | Use audio_mode_t consistently | Glenn Kasten | 2012-01-12 | 4 | -13/+13 |
* | | | Check stream type in AudioFlinger::createTrack | Glenn Kasten | 2012-01-17 | 3 | -10/+14 |
* | | | Merge "Fix locking for mMasterVolume and mMute" | Glenn Kasten | 2012-01-17 | 2 | -4/+15 |
|\ \ \ | |||||
| * | | | Fix locking for mMasterVolume and mMute | Glenn Kasten | 2012-01-13 | 2 | -4/+15 |
| |/ / | |||||
* | | | Merge "Use size_t for frame size" | Glenn Kasten | 2012-01-17 | 2 | -7/+8 |
|\ \ \ | |||||
| * | | | Use size_t for frame size | Glenn Kasten | 2012-01-13 | 2 | -7/+8 |
| |/ / | |||||
* | | | Merge "Use audio_stream_type_t consistently" | Glenn Kasten | 2012-01-17 | 4 | -41/+43 |
|\ \ \ | |||||
| * | | | Use audio_stream_type_t consistently | Glenn Kasten | 2012-01-13 | 4 | -41/+43 |
| |/ / | |||||
* | | | AudioTrack and AudioFlinger send level cleanup | Glenn Kasten | 2012-01-13 | 1 | -1/+7 |
|/ / | |||||
* | | Merge "Simplify range check for audio_mode_t" | Glenn Kasten | 2012-01-11 | 2 | -2/+2 |
|\ \ | |||||
| * | | Simplify range check for audio_mode_t | Glenn Kasten | 2012-01-10 | 2 | -2/+2 |
* | | | Merge "Use correct type for hardware call state" | Glenn Kasten | 2012-01-11 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | Use correct type for hardware call state | Glenn Kasten | 2012-01-06 | 2 | -2/+2 |
* | | | | Merge "Use consistent style of & reference for AutoMutex" | Glenn Kasten | 2012-01-11 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | Use consistent style of & reference for AutoMutex | Glenn Kasten | 2012-01-06 | 1 | -3/+3 |
| |/ / / | |||||
* | | | | Merge "AudioFlinger new can't fail" | Glenn Kasten | 2012-01-11 | 1 | -2/+1 |
|\ \ \ \ | |||||
| * | | | | AudioFlinger new can't fail | Glenn Kasten | 2012-01-06 | 1 | -2/+1 |
| |/ / / | |||||
* | | | | Merge "Fix build warning" | Glenn Kasten | 2012-01-11 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Fix build warning | Glenn Kasten | 2012-01-06 | 1 | -1/+1 |
| |/ / | |||||
* | | | Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE | Steve Block | 2012-01-09 | 3 | -6/+6 |
* | | | Merge "By convention const goes before the type specifier" | Glenn Kasten | 2012-01-09 | 5 | -23/+24 |
|\ \ \ | |||||
| * | | | By convention const goes before the type specifier | Glenn Kasten | 2012-01-06 | 5 | -23/+24 |
| |/ / | |||||
* | | | Use cached reference to media.player service | Glenn Kasten | 2012-01-09 | 1 | -5/+4 |
* | | | Merge "Replace loop by __builtin_ctz" | Glenn Kasten | 2012-01-09 | 1 | -9/+4 |
|\ \ \ | |||||
| * | | | Replace loop by __builtin_ctz | Glenn Kasten | 2012-01-05 | 1 | -9/+4 |
| |/ / | |||||
* | | | Merge "suspended() and isSuspended() are const" | Glenn Kasten | 2012-01-09 | 2 | -4/+5 |
|\ \ \ | |||||
| * | | | suspended() and isSuspended() are const | Glenn Kasten | 2012-01-05 | 2 | -4/+5 |
| |/ / | |||||
* | | | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE | Steve Block | 2012-01-08 | 4 | -45/+45 |
* | | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE | Steve Block | 2012-01-06 | 4 | -66/+66 |
* | | | Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE" | Steve Block | 2012-01-05 | 2 | -5/+5 |
|\ \ \ | |||||
| * | | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE | Steve Block | 2012-01-04 | 2 | -5/+5 |
* | | | | Merge "Remove the notion of "active track" from mixer" | Glenn Kasten | 2012-01-05 | 3 | -81/+89 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Remove the notion of "active track" from mixer | Glenn Kasten | 2011-12-20 | 3 | -81/+89 |