Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Move non-monotonic reporting to interface. | Jeff Sharkey | 2012-01-10 | 1 | -22/+27 | |
* | | | | | Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE | Steve Block | 2012-01-09 | 7 | -38/+38 | |
* | | | | | 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 | 27 | -204/+204 | |
* | | | | | am 4bc873e6: am 7944704e: Merge "Switch camera sounds to always use the syste... | Eino-Ville Talvala | 2012-01-06 | 2 | -12/+1 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| * | | | | Switch camera sounds to always use the system enforced audio stream. | Eino-Ville Talvala | 2012-01-06 | 2 | -12/+1 | |
| | |_|/ | |/| | | ||||||
* | | | | Don't allow reading of packagelist files. | Nick Kralevich | 2012-01-06 | 1 | -6/+3 | |
* | | | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE | Steve Block | 2012-01-06 | 18 | -129/+129 | |
* | | | | Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE" | Steve Block | 2012-01-05 | 13 | -69/+69 | |
|\ \ \ \ | ||||||
| * | | | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE | Steve Block | 2012-01-04 | 13 | -69/+69 | |
* | | | | | Merge "Filter our v6 address from tethering dns." | Robert Greenwalt | 2012-01-05 | 1 | -2/+14 | |
|\ \ \ \ \ | ||||||
| * | | | | | Filter our v6 address from tethering dns. | Robert Greenwalt | 2011-12-20 | 1 | -2/+14 | |
* | | | | | | 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 | |
* | | | | | | Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros" | Glenn Kasten | 2012-01-05 | 7 | -64/+54 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Use the standard CC_LIKELY and CC_UNLIKELY macros | Glenn Kasten | 2012-01-05 | 7 | -64/+54 | |
* | | | | | | | resolved conflicts for merge of 1a4b9939 to master | Eric Laurent | 2012-01-04 | 4 | -1/+30 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | / / | | |_|_|/ / | |/| | | | | ||||||
| * | | | | | audioflinger: fix clicks on 48kHz audio. | Eric Laurent | 2011-12-22 | 4 | -1/+30 | |
| * | | | | | Cherry-picking Id45abeba and Ia065dec6 for MR1 | Makoto Onuki | 2011-12-13 | 3 | -38/+161 | |
* | | | | | | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE | Steve Block | 2012-01-03 | 23 | -218/+218 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Merge "Fix 5783857: Device Policy Manager doesn't allow Face Unlock" | Danielle Millett | 2012-01-03 | 1 | -0/+1 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | ||||||
| * | | | | Fix 5783857: Device Policy Manager doesn't allow Face Unlock | Danielle Millett | 2011-12-22 | 1 | -0/+1 | |
| | |/ / | |/| | | ||||||
* | | | | Merge "Test the correct return code from call to cryptfs." | Jeff Sharkey | 2012-01-03 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Test the correct return code from call to cryptfs. | Fredrik Roubert | 2011-12-20 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | VPN: fix a CloseGuard warning. | Chia-chi Yeh | 2011-12-27 | 1 | -6/+2 | |
* | | | | Merge "Remove dead code" | Glenn Kasten | 2011-12-20 | 2 | -5/+4 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Remove dead code | Glenn Kasten | 2011-12-19 | 2 | -6/+4 | |
* | | | | Merge "audio effects: rename configure command" | Eric Laurent | 2011-12-19 | 1 | -1/+1 | |
|\ \ \ \ | |_|_|/ |/| | | | ||||||
| * | | | audio effects: rename configure command | Eric Laurent | 2011-12-19 | 1 | -1/+1 | |
* | | | | Merge "Use constants for 2 and 32" | Glenn Kasten | 2011-12-16 | 2 | -8/+8 | |
|\ \ \ \ | ||||||
| * | | | | Use constants for 2 and 32 | Glenn Kasten | 2011-12-16 | 2 | -8/+8 | |
* | | | | | Merge "Extract out audio DSP code to utility library" | Glenn Kasten | 2011-12-16 | 4 | -117/+10 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Extract out audio DSP code to utility library | Glenn Kasten | 2011-12-16 | 4 | -117/+10 | |
| | |/ / | |/| | | ||||||
* | | | | Merge "Use switch in AudioMixer::setParameter" | Glenn Kasten | 2011-12-16 | 2 | -36/+49 | |
|\ \ \ \ | ||||||
| * | | | | Use switch in AudioMixer::setParameter | Glenn Kasten | 2011-12-16 | 2 | -36/+49 | |
* | | | | | deleteTrackName now asserts on bad input parameter | Glenn Kasten | 2011-12-16 | 1 | -17/+16 | |
|/ / / / | ||||||
* | | | | Merge "Add plumbing for dumping database info using dumpsys." | Jeff Brown | 2011-12-16 | 1 | -0/+53 | |
|\ \ \ \ | ||||||
| * | | | | Add plumbing for dumping database info using dumpsys. | Jeff Brown | 2011-12-16 | 1 | -0/+53 | |
* | | | | | Merge "Don't forget to close files." | Dianne Hackborn | 2011-12-16 | 1 | -1/+14 | |
|\ \ \ \ \ | ||||||
| * | | | | | Don't forget to close files. | Dianne Hackborn | 2011-12-15 | 1 | -1/+14 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge "Add a new ui mode for "appliance"" | Joe Onorato | 2011-12-16 | 1 | -1/+4 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add a new ui mode for "appliance" | Joe Onorato | 2011-12-15 | 1 | -1/+4 | |
| |/ / / / | ||||||
* | | | | | Merge "setActiveTrack and setBufferProvider can't fail" | Glenn Kasten | 2011-12-16 | 2 | -10/+9 | |
|\ \ \ \ \ | ||||||
| * | | | | | setActiveTrack and setBufferProvider can't fail | Glenn Kasten | 2011-12-15 | 2 | -10/+9 | |
| | |_|/ / | |/| | | |