Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 85e6e87c: Merge "Restore accidentally-removed NULL timeout." | Elliott Hughes | 2014-05-22 | 1 | -1/+1 |
|\ | |||||
| * | Restore accidentally-removed NULL timeout. | Elliott Hughes | 2014-05-21 | 1 | -1/+1 |
* | | am 3b6da6bf: Merge "Move frameworks/av off private API." | Elliott Hughes | 2014-05-22 | 4 | -8/+8 |
|\ \ | |/ | |||||
| * | Move frameworks/av off private API. | Elliott Hughes | 2014-05-21 | 4 | -8/+8 |
* | | am d084206d: Merge "Move frameworks/av off __futex_syscall3." | Elliott Hughes | 2014-05-22 | 2 | -4/+4 |
|\ \ | |/ | |||||
| * | Move frameworks/av off __futex_syscall3. | Elliott Hughes | 2014-05-21 | 2 | -4/+4 |
* | | am ce473c32: Merge "Codec Offload: Add NULL check as mCallbackThread is NULL ... | Eric Laurent | 2014-05-19 | 1 | -1/+4 |
|\ \ | |/ | |||||
| * | Codec Offload: Add NULL check as mCallbackThread is NULL | Uday Gupta | 2014-05-13 | 1 | -1/+4 |
* | | am f02f06c4: Merge "camera: check Intent entry count before reading it" | Eino-Ville Talvala | 2014-05-12 | 1 | -0/+3 |
|\ \ | |/ | |||||
| * | Merge "camera: check Intent entry count before reading it" | Eino-Ville Talvala | 2014-05-12 | 1 | -0/+3 |
| |\ | |||||
| | * | camera: check Intent entry count before reading it | Yuvraj Pasi | 2014-05-12 | 1 | -0/+3 |
* | | | am 8fb04d47: Merge "Fix memory leak when filtering commands in insertCommand_... | Eric Laurent | 2014-05-06 | 2 | -10/+27 |
|\ \ \ | |/ / | |||||
| * | | Merge "Fix memory leak when filtering commands in insertCommand_l()" | Eric Laurent | 2014-05-06 | 2 | -10/+27 |
| |\ \ | |||||
| | * | | Fix memory leak when filtering commands in insertCommand_l() | Jesper Tragardh | 2014-04-11 | 2 | -10/+27 |
| | |/ | |||||
* | | | Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEAD | Bill Yi | 2014-04-29 | 7 | -102/+217 |
|\ \ \ | |/ / |/| | | |||||
| * | | am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/r... | Igor Murashkin | 2014-03-25 | 2 | -44/+121 |
| |\ \ | |||||
| | * | | DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values | Igor Murashkin | 2014-03-25 | 2 | -44/+121 |
| * | | | am 4f53fe74: Merge "CameraService: deadlock fix" | Eino-Ville Talvala | 2014-03-25 | 1 | -0/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | resolved conflicts for merge of 3d7c5002 to klp-dev-plus-aosp | Colin Cross | 2014-03-21 | 20 | -70/+80 |
| |\ \ \ | |||||
| * \ \ \ | am 36817364: Merge "Add libaudioresampler" | Glenn Kasten | 2014-03-19 | 1 | -11/+18 |
| |\ \ \ \ | |||||
| * \ \ \ \ | am 77658a06: Merge "AudioPolicyService: malloc/delete pair" | Glenn Kasten | 2014-03-18 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | am bd3e2e03: camera2: Fix segfault when using null availability listener | Igor Murashkin | 2014-03-17 | 1 | -0/+10 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | camera2: Fix segfault when using null availability listener | Igor Murashkin | 2014-03-17 | 1 | -0/+10 |
| * | | | | | | am 089affb6: Merge "mediaserver and associated services are 32-bit only" | Glenn Kasten | 2014-03-14 | 3 | -0/+4 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size ... | Zhijun He | 2014-03-10 | 1 | -0/+16 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | DO NOT MERGE: Camera: delete preview callback when preview size is changed | Zhijun He | 2014-03-10 | 1 | -0/+16 |
| * | | | | | | | am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev | Eino-Ville Talvala | 2014-03-07 | 3 | -55/+66 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev | Eino-Ville Talvala | 2014-03-07 | 3 | -55/+66 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | DO NOT MERGE: Camera: fix focusArea wrong indexing issue | Zhijun He | 2014-03-05 | 1 | -14/+14 |
| | | * | | | | | | DO NOT MERGE: camera2: Fix race with stream deletion during disconnect. | Ruben Brunk | 2014-03-05 | 1 | -6/+8 |
| | | * | | | | | | DO NOT MERGE: camera2/3: Add protection for still capture path | Zhijun He | 2014-03-05 | 1 | -35/+44 |
| | * | | | | | | | Increase kFastTrackMultiplier from 1 to 2 | Glenn Kasten | 2014-03-05 | 1 | -7/+7 |
| * | | | | | | | | am 3c9130a8: Merge "Make frameworks/av 64-bit compatible" | Narayan Kamath | 2014-03-07 | 17 | -58/+73 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | am 5930e8eb: Merge "AudioFlinger: Remove code for supporting resampling in fa... | Glenn Kasten | 2014-03-07 | 4 | -26/+5 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | am 4361749d: Merge "AudioTrack: Never try to use the fast path if resampling ... | Glenn Kasten | 2014-03-07 | 2 | -5/+0 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | am d66cd743: Merge "audioflinger: conform inline ASM to UAL" | Glenn Kasten | 2014-03-07 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | am 281dd4e1: audioflinger: fix static track end detection | Eric Laurent | 2014-03-05 | 1 | -9/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | audioflinger: fix static track end detection | Eric Laurent | 2014-03-05 | 1 | -9/+2 |
| | * | | | | | | | | | | | AudioMixer: Remove tracks from enabledTracks after reseting outTemp | Gaurav Kumar | 2014-03-05 | 1 | -4/+7 |
| * | | | | | | | | | | | | am 7e92abea: audioflinger: fix offload write buffer offset | Eric Laurent | 2014-03-05 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | audioflinger: fix offload write buffer offset | Eric Laurent | 2014-03-05 | 1 | -2/+2 |
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | audioflinger: check for condition before waiting | Haynes Mathew George | 2014-03-04 | 1 | -1/+6 |
| * | | | | | | | | | | | am e0cd1051: audioflinger: update track ready condition | Haynes Mathew George | 2014-03-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | audioflinger: update track ready condition | Haynes Mathew George | 2014-03-04 | 1 | -1/+1 |
| * | | | | | | | | | | | am e010f65e: audioflinger: Fix for a deadlock in track creation | Haynes Mathew George | 2014-03-05 | 2 | -2/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | audioflinger: Fix for a deadlock in track creation | Haynes Mathew George | 2014-03-04 | 2 | -2/+6 |
* | | | | | | | | | | | | Merge "AArch64: rewrite audioflinger's sinc resample by intrinsics." | Glenn Kasten | 2014-04-23 | 1 | -151/+165 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | AArch64: rewrite audioflinger's sinc resample by intrinsics. | Zhongwei Yao | 2014-04-10 | 1 | -151/+165 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge "camera: set mNeedConfig after creating ZSL stream" | Eino-Ville Talvala | 2014-04-21 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | camera: set mNeedConfig after creating ZSL stream | Yuvraj Pasi | 2014-04-15 | 1 | -0/+2 |
| |/ / / / / / / / / / / |