summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* Merge "camera2: Update CameraService for HAL1 shim."Ruben Brunk2014-05-225-89/+295
|\
| * camera2: Update CameraService for HAL1 shim.Ruben Brunk2014-05-215-89/+295
* | resolved conflicts for merge of c0bf836f to masterElliott Hughes2014-05-214-13/+11
|\ \
| * \ am 3b6da6bf: Merge "Move frameworks/av off private API."Elliott Hughes2014-05-224-8/+8
| |\ \
| | * | Move frameworks/av off private API.Elliott Hughes2014-05-214-8/+8
* | | | resolved conflicts for merge of b1080917 to masterElliott Hughes2014-05-212-4/+4
|\ \ \ \ | |/ / /
| * | | am d084206d: Merge "Move frameworks/av off __futex_syscall3."Elliott Hughes2014-05-222-4/+4
| |\ \ \ | | |/ /
| | * | Move frameworks/av off __futex_syscall3.Elliott Hughes2014-05-212-4/+4
* | | | Merge "audio policy: split audio policy library"Eric Laurent2014-05-221-4/+33
|\ \ \ \ | |_|_|/ |/| | |
| * | | audio policy: split audio policy libraryEric Laurent2014-05-211-4/+33
* | | | Merge "audio policy: add new audio devices"Eric Laurent2014-05-201-0/+12
|\ \ \ \
| * | | | audio policy: add new audio devicesEric Laurent2014-05-191-0/+12
| |/ / /
* | | | Merge "Update AudioMixer::getTrackName to save channelMask"Andy Hung2014-05-202-12/+9
|\ \ \ \
| * | | | Update AudioMixer::getTrackName to save channelMaskAndy Hung2014-05-162-12/+9
* | | | | Merge "Use new channel count functions for audio masks"Andy Hung2014-05-194-10/+14
|\ \ \ \ \ | |/ / / /
| * | | | Use new channel count functions for audio masksAndy Hung2014-05-164-10/+14
| |/ / /
* | | | Merge "Pass stereo gains as packed minifloat"Glenn Kasten2014-05-198-44/+57
|\ \ \ \
| * | | | Pass stereo gains as packed minifloatGlenn Kasten2014-05-198-44/+57
| |/ / /
* | | | am be2664da: am 4c9bde7a: am ce473c32: Merge "Codec Offload: Add NULL check a...Eric Laurent2014-05-191-1/+4
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am ce473c32: Merge "Codec Offload: Add NULL check as mCallbackThread is NULL ...Eric Laurent2014-05-191-1/+4
| |\ \ | | |/
| | * Codec Offload: Add NULL check as mCallbackThread is NULLUday Gupta2014-05-131-1/+4
* | | Merge "Pull up mFlags and isFastTrack from Track to TrackBase"Glenn Kasten2014-05-145-10/+12
|\ \ \
| * | | Pull up mFlags and isFastTrack from Track to TrackBaseGlenn Kasten2014-05-135-10/+12
* | | | Merge "Explicitly include Configuration.h"Glenn Kasten2014-05-132-0/+3
|\ \ \ \ | |/ / /
| * | | Explicitly include Configuration.hGlenn Kasten2014-05-132-0/+3
* | | | Merge "Fix memory corruption if increaseSamplingN is not called"Glenn Kasten2014-05-131-1/+1
|\ \ \ \ | |/ / /
| * | | Fix memory corruption if increaseSamplingN is not calledGlenn Kasten2014-05-131-1/+1
* | | | AudioFlinger: add specific mutex for client listsEric Laurent2014-05-136-92/+87
* | | | Merge "audiopolicy: refactor audio command threads"Eric Laurent2014-05-122-118/+83
|\ \ \ \
| * | | | audiopolicy: refactor audio command threadsEric Laurent2014-05-122-118/+83
* | | | | am 7fd1af85: am c36fbcdf: am f02f06c4: Merge "camera: check Intent entry coun...Eino-Ville Talvala2014-05-121-0/+3
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | am f02f06c4: Merge "camera: check Intent entry count before reading it"Eino-Ville Talvala2014-05-121-0/+3
| |\ \ \ | | | |/ | | |/|
| | * | Merge "camera: check Intent entry count before reading it"Eino-Ville Talvala2014-05-121-0/+3
| | |\ \
| | | * | camera: check Intent entry count before reading itYuvraj Pasi2014-05-121-0/+3
* | | | | Explicitly ignore return value of __futex_syscall3Glenn Kasten2014-05-091-2/+2
| |_|_|/ |/| | |
* | | | Merge "Remove obsolete IAudioRecord::getCblk()"Glenn Kasten2014-05-092-5/+0
|\ \ \ \
| * | | | Remove obsolete IAudioRecord::getCblk()Glenn Kasten2014-05-092-5/+0
* | | | | Merge "audioflinger: refactor thread config events"Eric Laurent2014-05-094-384/+436
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | audioflinger: refactor thread config eventsEric Laurent2014-05-094-384/+436
* | | | | IAudioFlinger::openRecord returns IMemory(s)Glenn Kasten2014-05-096-12/+47
|/ / / /
* | | | audio policy: fix mute delay when setting output deviceEric Laurent2014-05-081-18/+25
* | | | Merge "Add a per-thread heap that is read-only to clients"Glenn Kasten2014-05-082-0/+19
|\ \ \ \
| * | | | Add a per-thread heap that is read-only to clientsGlenn Kasten2014-05-072-0/+19
* | | | | Merge "audio policy: cleanup AudioPolicyService destructor"Eric Laurent2014-05-081-3/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | audio policy: cleanup AudioPolicyService destructorEric Laurent2014-05-071-3/+1
* | | | | Merge "Fix a couple of fast capture typo bugs"Glenn Kasten2014-05-071-2/+2
|\ \ \ \ \
| * | | | | Fix a couple of fast capture typo bugsGlenn Kasten2014-05-071-2/+2
* | | | | | audio policy: fix typo in AudioPolicyManager constructorEric Laurent2014-05-071-6/+6
| |/ / / / |/| | | |
* | | | | Merge "audio policy: update from libhardware_legacy"Eric Laurent2014-05-072-108/+349
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | audio policy: update from libhardware_legacyEric Laurent2014-05-062-108/+349