summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"Steve Block2012-01-0513-69/+69
|\
| * Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-0413-69/+69
* | Merge "Filter our v6 address from tethering dns."Robert Greenwalt2012-01-051-2/+14
|\ \
| * | Filter our v6 address from tethering dns.Robert Greenwalt2011-12-201-2/+14
* | | 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-057-64/+54
|\ \ \ \
| * | | | Use the standard CC_LIKELY and CC_UNLIKELY macrosGlenn Kasten2012-01-057-64/+54
* | | | | 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
| * | | | Cherry-picking Id45abeba and Ia065dec6 for MR1Makoto Onuki2011-12-133-38/+161
* | | | | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-0323-218/+218
| |/ / / |/| | |
* | | | Merge "Fix 5783857: Device Policy Manager doesn't allow Face Unlock"Danielle Millett2012-01-031-0/+1
|\ \ \ \
| * | | | Fix 5783857: Device Policy Manager doesn't allow Face UnlockDanielle Millett2011-12-221-0/+1
| | |/ / | |/| |
* | | | Merge "Test the correct return code from call to cryptfs."Jeff Sharkey2012-01-031-1/+1
|\ \ \ \
| * | | | Test the correct return code from call to cryptfs.Fredrik Roubert2011-12-201-1/+1
| |/ / /
* | | | VPN: fix a CloseGuard warning.Chia-chi Yeh2011-12-271-6/+2
* | | | 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 "Add plumbing for dumping database info using dumpsys."Jeff Brown2011-12-161-0/+53
|\ \ \ \
| * | | | Add plumbing for dumping database info using dumpsys.Jeff Brown2011-12-161-0/+53
* | | | | Merge "Don't forget to close files."Dianne Hackborn2011-12-161-1/+14
|\ \ \ \ \
| * | | | | Don't forget to close files.Dianne Hackborn2011-12-151-1/+14
| | |_|/ / | |/| | |
* | | | | Merge "Add a new ui mode for "appliance""Joe Onorato2011-12-161-1/+4
|\ \ \ \ \
| * | | | | Add a new ui mode for "appliance"Joe Onorato2011-12-151-1/+4
| |/ / / /
* | | | | 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 "Move NMS observers to RemoteCallbackList."Jeff Sharkey2011-12-151-29/+33
|\ \ \ \
| * | | | Move NMS observers to RemoteCallbackList.Jeff Sharkey2011-12-151-29/+33
* | | | | 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
| |/ / /
* | | | Merge "Restrict app data on metered networks."Jeff Sharkey2011-12-153-14/+77
|\ \ \ \
| * | | | Restrict app data on metered networks.Jeff Sharkey2011-12-153-14/+77
* | | | | Add ContentProvider.dump()Marco Nelissen2011-12-151-0/+125
|/ / / /
* | | | Merge "Move NMS to CONNECTIVITY_INTERNAL permission."Jeff Sharkey2011-12-152-63/+62
|\ \ \ \ | |_|/ / |/| | |
| * | | Move NMS to CONNECTIVITY_INTERNAL permission.Jeff Sharkey2011-12-142-63/+62
* | | | Merge "Fix indentation and whitespace"Glenn Kasten2011-12-142-54/+53
|\ \ \ \