summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am 2716969d: resolved conflicts for merge of 3bc345f5 to stage-aosp-masterElliott Hughes2014-11-171-7/+0
|\
| * libcutils no longer requires that its users configure ANDROID_SMP.Elliott Hughes2014-11-171-7/+0
* | am 771a362d: am 3171f4e1: Merge "CameraService: normalize face rectangles pro...Chien-Yu Chen2014-11-173-73/+90
|\ \
| * \ Merge "CameraService: normalize face rectangles properly" into lmp-mr1-devChien-Yu Chen2014-11-173-73/+90
| |\ \
| | * | CameraService: normalize face rectangles properlyChien-Yu Chen2014-11-133-73/+90
* | | | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aospMarco Nelissen2014-11-1712-29/+29
|\ \ \ \ | | |_|/ | |/| |
| * | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-1712-29/+29
* | | | am 0ef3210f: am 14a74010: Merge "Include AudioPolicyInterface.h only when nee...Chih-Hung Hsieh2014-11-152-0/+3
|\ \ \ \ | |/ / /
| * | | Include AudioPolicyInterface.h only when needed.Chih-Hung Hsieh2014-11-142-0/+3
* | | | am 06ce4cf5: Merge "Camera2Device: fix camera metadata leaks" into lmp-mr1-de...Chien-Yu Chen2014-11-122-15/+5
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Camera2Device: fix camera metadata leaks" into lmp-mr1-devChien-Yu Chen2014-11-122-15/+5
| |\ \ \ | | |_|/ | |/| |
| | * | Camera2Device: fix camera metadata leaksChien-Yu Chen2014-11-102-15/+5
* | | | am 2f702c9b: am 43e10bb7: Merge "Move to libc++."Dan Albert2014-11-111-14/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | Move to libc++.Dan Albert2014-11-111-14/+3
* | | | am 7b28e4e7: am 9527a598: Merge "Camera: Guard against asBinder() calls on NU...Eino-Ville Talvala2014-11-116-16/+26
|\ \ \ \ | |/ / /
| * | | Camera: Guard against asBinder() calls on NULL interfacesEino-Ville Talvala2014-11-076-16/+26
| * | | am ac302143: Fix the fixMarco Nelissen2014-10-201-1/+3
| |\ \ \
| * \ \ \ am 22bc10a3: Merge "Clear effect buffer before sending to chain" into lmp-devMarco Nelissen2014-10-201-4/+3
| |\ \ \ \
| * \ \ \ \ am a2d4a6da: audio policy: Fix for voice call audio lossHaynes Mathew George2014-10-161-0/+20
| |\ \ \ \ \
| * \ \ \ \ \ am 9d2189ff: Merge "Camera2Client: avoid two consecutive sets of configure_st...Zhijun He2014-10-141-0/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 9286354c: Merge "Revert "audio policy: add support for ro.audio.media_deep...Dave Burke2014-10-122-13/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am ffd5cdbd: Merge "audio policy: add support for ro.audio.media_deep_buffer"...Eric Laurent2014-10-102-1/+13
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am f5ada6ed: audio policy: move intializations to onFirstRef()Eric Laurent2014-10-102-0/+7
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 07811789: Merge "audio policy: fix build with USE_LEGACY_AUDIO_POLICY" int...Eric Laurent2014-10-072-2/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 5bee844f: Merge "audio policy: fix lockup during mediaserver restart" into...Eric Laurent2014-10-075-115/+186
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 2b217bb3: Merge "audioflinger: fix pre processing transfer between record ...Eric Laurent2014-10-034-15/+76
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am be9ebd46: Merge "Fix uncertainty of one normal mix buffer in AudioTrack::g...Glenn Kasten2014-10-033-2/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am cb4b6e9f: audioflinger: fix failure to indicate volume to effectEric Laurent2014-10-022-10/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a49c94ea: Merge "Revert "Fix uncertainty of one normal mix buffer in Audio...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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6c7ae72f: Merge "audio policy: fix HW A/V sync output selection" into lmp-devEric Laurent2014-09-301-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f71224ce: Merge "audioflinger: forward flush to direct output streams" int...Eric Laurent2014-09-303-4/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c8c05d6a: Merge "CameraService: API1: Reallocate JPEG ashmem heap if size ...Eino-Ville Talvala2014-09-301-1/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4379c034: Merge "Fix tee sink" into lmp-devGlenn Kasten2014-09-291-3/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am dc2e6ddc: Camera2Client: Revert HALv2 device behavior back to MR2Eino-Ville Talvala2014-09-292-47/+69
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a67ced97: Merge "CameraService: API1: Fix flash mode" into lmp-devEino-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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 504de531: Merge "audio: fix stream type for accessibility usage" into lmp-devEric Laurent2014-09-264-1/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c53b98f3: am 6cd6792a: Merge "Allow building on clang without __builtin_as...Ian Rogers2014-09-261-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ccfeadcd: audioflinger: fix duplicating thread output buffers clear autome...Eric Laurent2014-11-081-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | audioflinger: fix duplicating thread output buffers clearEric Laurent2014-11-071-1/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | | am 034d6747: am 1609e451: Merge "Add a BufferItem parameter to onFrameAvailab...Dan Stoza2014-11-0712-13/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-devDan Stoza2014-11-0712-13/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Add a BufferItem parameter to onFrameAvailableDan Stoza2014-11-0412-13/+13
* | | | | | | | | | | | | | | | | | | | | | | | | | | | am b7092547: Merge "remove some restrictions on effect output channels" into ...Eric Laurent2014-11-041-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "remove some restrictions on effect output channels" into lmp-mr1-devEric Laurent2014-11-041-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | remove some restrictions on effect output channelsEric Laurent2014-11-031-1/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "CameraService: API1: fix picture FOV" into lmp-mr1-dev automerge: 3736dbcChien-Yu Chen2014-11-041-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "CameraService: API1: fix picture FOV" into lmp-mr1-devChien-Yu Chen2014-11-031-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | CameraService: API1: fix picture FOVChien-Yu Chen2014-10-281-0/+14