Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 2716969d: resolved conflicts for merge of 3bc345f5 to stage-aosp-master | Elliott Hughes | 2014-11-17 | 1 | -7/+0 |
|\ | |||||
| * | libcutils no longer requires that its users configure ANDROID_SMP. | Elliott Hughes | 2014-11-17 | 1 | -7/+0 |
* | | am 771a362d: am 3171f4e1: Merge "CameraService: normalize face rectangles pro... | Chien-Yu Chen | 2014-11-17 | 3 | -73/+90 |
|\ \ | |||||
| * \ | Merge "CameraService: normalize face rectangles properly" into lmp-mr1-dev | Chien-Yu Chen | 2014-11-17 | 3 | -73/+90 |
| |\ \ | |||||
| | * | | CameraService: normalize face rectangles properly | Chien-Yu Chen | 2014-11-13 | 3 | -73/+90 |
* | | | | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aosp | Marco Nelissen | 2014-11-17 | 12 | -29/+29 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Update calls to IInterface::asBinder() | Marco Nelissen | 2014-11-17 | 12 | -29/+29 |
* | | | | am 0ef3210f: am 14a74010: Merge "Include AudioPolicyInterface.h only when nee... | Chih-Hung Hsieh | 2014-11-15 | 2 | -0/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Include AudioPolicyInterface.h only when needed. | Chih-Hung Hsieh | 2014-11-14 | 2 | -0/+3 |
* | | | | am 06ce4cf5: Merge "Camera2Device: fix camera metadata leaks" into lmp-mr1-de... | Chien-Yu Chen | 2014-11-12 | 2 | -15/+5 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge "Camera2Device: fix camera metadata leaks" into lmp-mr1-dev | Chien-Yu Chen | 2014-11-12 | 2 | -15/+5 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Camera2Device: fix camera metadata leaks | Chien-Yu Chen | 2014-11-10 | 2 | -15/+5 |
* | | | | am 2f702c9b: am 43e10bb7: Merge "Move to libc++." | Dan Albert | 2014-11-11 | 1 | -14/+3 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Move to libc++. | Dan Albert | 2014-11-11 | 1 | -14/+3 |
* | | | | am 7b28e4e7: am 9527a598: Merge "Camera: Guard against asBinder() calls on NU... | Eino-Ville Talvala | 2014-11-11 | 6 | -16/+26 |
|\ \ \ \ | |/ / / | |||||
| * | | | Camera: Guard against asBinder() calls on NULL interfaces | Eino-Ville Talvala | 2014-11-07 | 6 | -16/+26 |
| * | | | am ac302143: Fix the fix | Marco Nelissen | 2014-10-20 | 1 | -1/+3 |
| |\ \ \ | |||||
| * \ \ \ | am 22bc10a3: Merge "Clear effect buffer before sending to chain" into lmp-dev | Marco Nelissen | 2014-10-20 | 1 | -4/+3 |
| |\ \ \ \ | |||||
| * \ \ \ \ | am a2d4a6da: audio policy: Fix for voice call audio loss | Haynes Mathew George | 2014-10-16 | 1 | -0/+20 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | am 9d2189ff: Merge "Camera2Client: avoid two consecutive sets of configure_st... | Zhijun He | 2014-10-14 | 1 | -0/+4 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | am 9286354c: Merge "Revert "audio policy: add support for ro.audio.media_deep... | Dave Burke | 2014-10-12 | 2 | -13/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | am ffd5cdbd: Merge "audio policy: add support for ro.audio.media_deep_buffer"... | Eric Laurent | 2014-10-10 | 2 | -1/+13 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | am f5ada6ed: audio policy: move intializations to onFirstRef() | Eric Laurent | 2014-10-10 | 2 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | am 07811789: Merge "audio policy: fix build with USE_LEGACY_AUDIO_POLICY" int... | Eric Laurent | 2014-10-07 | 2 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | am 5bee844f: Merge "audio policy: fix lockup during mediaserver restart" into... | Eric Laurent | 2014-10-07 | 5 | -115/+186 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | am 2b217bb3: Merge "audioflinger: fix pre processing transfer between record ... | Eric Laurent | 2014-10-03 | 4 | -15/+76 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | am be9ebd46: Merge "Fix uncertainty of one normal mix buffer in AudioTrack::g... | Glenn Kasten | 2014-10-03 | 3 | -2/+29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | am cb4b6e9f: audioflinger: fix failure to indicate volume to effect | Eric Laurent | 2014-10-02 | 2 | -10/+23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am a49c94ea: Merge "Revert "Fix uncertainty of one normal mix buffer in Audio... | Glenn Kasten | 2014-10-01 | 3 | -23/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 955e24d3: Merge "Fix uncertainty of one normal mix buffer in AudioTrack::g... | Glenn Kasten | 2014-09-30 | 3 | -1/+23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 6c7ae72f: Merge "audio policy: fix HW A/V sync output selection" into lmp-dev | Eric Laurent | 2014-09-30 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am f71224ce: Merge "audioflinger: forward flush to direct output streams" int... | Eric Laurent | 2014-09-30 | 3 | -4/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am c8c05d6a: Merge "CameraService: API1: Reallocate JPEG ashmem heap if size ... | Eino-Ville Talvala | 2014-09-30 | 1 | -1/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 4379c034: Merge "Fix tee sink" into lmp-dev | Glenn Kasten | 2014-09-29 | 1 | -3/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am dc2e6ddc: Camera2Client: Revert HALv2 device behavior back to MR2 | Eino-Ville Talvala | 2014-09-29 | 2 | -47/+69 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am a67ced97: Merge "CameraService: API1: Fix flash mode" into lmp-dev | Eino-Ville Talvala | 2014-09-27 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am a8a4eeb9: Merge "audio policy: favor mixed over direct output for PCM form... | Eric Laurent | 2014-09-26 | 1 | -1/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 504de531: Merge "audio: fix stream type for accessibility usage" into lmp-dev | Eric Laurent | 2014-09-26 | 4 | -1/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am c53b98f3: am 6cd6792a: Merge "Allow building on clang without __builtin_as... | Ian Rogers | 2014-09-26 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am ccfeadcd: audioflinger: fix duplicating thread output buffers clear autome... | Eric Laurent | 2014-11-08 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | audioflinger: fix duplicating thread output buffers clear | Eric Laurent | 2014-11-07 | 1 | -1/+5 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | am 034d6747: am 1609e451: Merge "Add a BufferItem parameter to onFrameAvailab... | Dan Stoza | 2014-11-07 | 12 | -13/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev | Dan Stoza | 2014-11-07 | 12 | -13/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Add a BufferItem parameter to onFrameAvailable | Dan Stoza | 2014-11-04 | 12 | -13/+13 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | am b7092547: Merge "remove some restrictions on effect output channels" into ... | Eric Laurent | 2014-11-04 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "remove some restrictions on effect output channels" into lmp-mr1-dev | Eric Laurent | 2014-11-04 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | remove some restrictions on effect output channels | Eric Laurent | 2014-11-03 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "CameraService: API1: fix picture FOV" into lmp-mr1-dev automerge: 3736dbc | Chien-Yu Chen | 2014-11-04 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "CameraService: API1: fix picture FOV" into lmp-mr1-dev | Chien-Yu Chen | 2014-11-03 | 1 | -0/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | CameraService: API1: fix picture FOV | Chien-Yu Chen | 2014-10-28 | 1 | -0/+14 |