summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am 07811789: Merge "audio policy: fix build with USE_LEGACY_AUDIO_POLICY" int...Eric Laurent2014-10-072-2/+3
|\
| * audio policy: fix build with USE_LEGACY_AUDIO_POLICYEric Laurent2014-10-072-2/+3
* | am 5bee844f: Merge "audio policy: fix lockup during mediaserver restart" into...Eric Laurent2014-10-075-115/+186
|\ \ | |/
| * audio policy: fix lockup during mediaserver restartEric Laurent2014-10-075-115/+186
* | am 2b217bb3: Merge "audioflinger: fix pre processing transfer between record ...Eric Laurent2014-10-034-15/+76
|\ \ | |/
| * Merge "audioflinger: fix pre processing transfer between record threads." int...Eric Laurent2014-10-034-15/+76
| |\
| | * audioflinger: fix pre processing transfer between record threads.Eric Laurent2014-10-024-15/+76
* | | am be9ebd46: Merge "Fix uncertainty of one normal mix buffer in AudioTrack::g...Glenn Kasten2014-10-033-2/+29
|\ \ \ | |/ /
| * | Fix uncertainty of one normal mix buffer in AudioTrack::getTimestampGlenn Kasten2014-10-023-2/+29
| |/
* | am cb4b6e9f: audioflinger: fix failure to indicate volume to effectEric Laurent2014-10-022-10/+23
|\ \ | |/
| * audioflinger: fix failure to indicate volume to effectEric Laurent2014-10-012-10/+23
* | am a49c94ea: Merge "Revert "Fix uncertainty of one normal mix buffer in Audio...Glenn Kasten2014-10-013-23/+1
|\ \ | |/
| * Merge "Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTim...Glenn Kasten2014-10-013-23/+1
| |\
| | * Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp"Glenn Kasten2014-10-013-23/+1
* | | am 955e24d3: Merge "Fix uncertainty of one normal mix buffer in AudioTrack::g...Glenn Kasten2014-09-303-1/+23
|\ \ \ | |/ /
| * | Merge "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp" ...Glenn Kasten2014-09-303-1/+23
| |\ \ | | |/
| | * Fix uncertainty of one normal mix buffer in AudioTrack::getTimestampGlenn Kasten2014-09-303-1/+23
* | | am 6c7ae72f: Merge "audio policy: fix HW A/V sync output selection" into lmp-devEric Laurent2014-09-301-1/+3
|\ \ \ | |/ /
| * | Merge "audio policy: fix HW A/V sync output selection" into lmp-devEric Laurent2014-09-301-1/+3
| |\ \
| | * | audio policy: fix HW A/V sync output selectionEric Laurent2014-09-291-1/+3
* | | | am f71224ce: Merge "audioflinger: forward flush to direct output streams" int...Eric Laurent2014-09-303-4/+16
|\ \ \ \ | |/ / /
| * | | Merge "audioflinger: forward flush to direct output streams" into lmp-devEric Laurent2014-09-303-4/+16
| |\ \ \
| | * | | audioflinger: forward flush to direct output streamsEric Laurent2014-09-293-4/+16
| | |/ /
* | | | am c8c05d6a: Merge "CameraService: API1: Reallocate JPEG ashmem heap if size ...Eino-Ville Talvala2014-09-301-1/+14
|\ \ \ \ | |/ / /
| * | | Merge "CameraService: API1: Reallocate JPEG ashmem heap if size changes" into...Eino-Ville Talvala2014-09-291-1/+14
| |\ \ \
| | * | | CameraService: API1: Reallocate JPEG ashmem heap if size changesEino-Ville Talvala2014-09-291-1/+14
| | |/ /
* | | | am 4379c034: Merge "Fix tee sink" into lmp-devGlenn Kasten2014-09-291-3/+5
|\ \ \ \ | |/ / /
| * | | Merge "Fix tee sink" into lmp-devGlenn Kasten2014-09-291-3/+5
| |\ \ \ | | |/ / | |/| |
| | * | Fix tee sinkGlenn Kasten2014-09-281-3/+5
| | |/
* | | am dc2e6ddc: Camera2Client: Revert HALv2 device behavior back to MR2Eino-Ville Talvala2014-09-292-47/+69
|\ \ \ | |/ /
| * | Camera2Client: Revert HALv2 device behavior back to MR2Eino-Ville Talvala2014-09-282-47/+69
| |/
* | am a67ced97: Merge "CameraService: API1: Fix flash mode" into lmp-devEino-Ville Talvala2014-09-271-1/+1
|\ \ | |/
| * Merge "CameraService: API1: Fix flash mode" into lmp-devEino-Ville Talvala2014-09-271-1/+1
| |\
| | * CameraService: API1: Fix flash modeEino-Ville Talvala2014-09-271-1/+1
* | | am a8a4eeb9: Merge "audio policy: favor mixed over direct output for PCM form...Eric Laurent2014-09-261-1/+11
|\ \ \ | |/ /
| * | Merge "audio policy: favor mixed over direct output for PCM format" into lmp-devEric Laurent2014-09-261-1/+11
| |\ \
| | * | audio policy: favor mixed over direct output for PCM formatEric Laurent2014-09-261-1/+11
* | | | am 504de531: Merge "audio: fix stream type for accessibility usage" into lmp-devEric Laurent2014-09-264-1/+18
|\ \ \ \ | |/ / /
| * | | Merge "audio: fix stream type for accessibility usage" into lmp-devEric Laurent2014-09-264-1/+18
| |\ \ \ | | |_|/ | |/| |
| | * | audio: fix stream type for accessibility usageEric Laurent2014-09-254-1/+18
| | |/
* | | am c53b98f3: am 6cd6792a: Merge "Allow building on clang without __builtin_as...Ian Rogers2014-09-261-1/+4
|\ \ \ | |/ / |/| |
| * | Allow building on clang without __builtin_assume_alignedBernhard Rosenkraenzer2014-09-191-1/+4
| * | Remove 64-bit android_atomic uses from StateQueue.Hans Boehm2014-07-232-12/+8
* | | Camera1 shim: If there's no flash, the keys need to be null.Eino-Ville Talvala2014-09-251-10/+13
* | | camera: add traces for KPI measurementRuchit Sharma2014-09-252-2/+16
| |/ |/|
* | Merge "audio policy: add hw hotword flag for inputs" into lmp-devEric Laurent2014-09-242-31/+69
|\ \
| * | audio policy: add hw hotword flag for inputsEric Laurent2014-09-192-31/+69
* | | Camera2Client: log an error when autoFocus is called in wrong stateZhijun He2014-09-231-0/+2
* | | Merge "API1: ZSL buffers should be skipped for manual AF mode" into lmp-devZhijun He2014-09-201-0/+5
|\ \ \
| * | | API1: ZSL buffers should be skipped for manual AF modeZhijun He2014-09-191-0/+5
| |/ /