Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge "Simplify enable/disable mixing" | Glenn Kasten | 2011-12-16 | 3 | -30/+15 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Simplify enable/disable mixing | Glenn Kasten | 2011-12-15 | 3 | -30/+15 |
| |/ / / | |||||
* | | | | Merge "Move NMS observers to RemoteCallbackList." | Jeff Sharkey | 2011-12-15 | 1 | -29/+33 |
|\ \ \ \ | |||||
| * | | | | Move NMS observers to RemoteCallbackList. | Jeff Sharkey | 2011-12-15 | 1 | -29/+33 |
* | | | | | Merge "Improve resistance to leaks for ConfigEvent" | Glenn Kasten | 2011-12-15 | 2 | -8/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Improve resistance to leaks for ConfigEvent | Glenn Kasten | 2011-12-15 | 2 | -8/+7 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge "Use NULL not 0 for pointers" | Glenn Kasten | 2011-12-15 | 3 | -29/+29 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Use NULL not 0 for pointers | Glenn Kasten | 2011-12-15 | 3 | -29/+29 |
| |/ / / | |||||
* | | | | Merge "Restrict app data on metered networks." | Jeff Sharkey | 2011-12-15 | 3 | -14/+77 |
|\ \ \ \ | |||||
| * | | | | Restrict app data on metered networks. | Jeff Sharkey | 2011-12-15 | 3 | -14/+77 |
* | | | | | Add ContentProvider.dump() | Marco Nelissen | 2011-12-15 | 1 | -0/+125 |
|/ / / / | |||||
* | | | | Merge "Move NMS to CONNECTIVITY_INTERNAL permission." | Jeff Sharkey | 2011-12-15 | 2 | -63/+62 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Move NMS to CONNECTIVITY_INTERNAL permission. | Jeff Sharkey | 2011-12-14 | 2 | -63/+62 |
* | | | | Merge "Fix indentation and whitespace" | Glenn Kasten | 2011-12-14 | 2 | -54/+53 |
|\ \ \ \ |