Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "audio policy: add option to use new policy manager" | Eric Laurent | 2014-03-21 | 8 | -218/+997 |
|\ | |||||
| * | audio policy: add option to use new policy manager | Eric Laurent | 2014-03-18 | 8 | -218/+997 |
* | | camera: Fix setParameters for Preview FPS single/range values | Igor Murashkin | 2014-03-20 | 1 | -41/+116 |
* | | resolved conflicts for merge of f40c4c56 to master | Glenn Kasten | 2014-03-19 | 1 | -9/+19 |
|\ \ | |||||
| * \ | am 36817364: Merge "Add libaudioresampler" | Glenn Kasten | 2014-03-19 | 1 | -11/+18 |
| |\ \ | |||||
| | * | | Add libaudioresampler | Glenn Kasten | 2014-03-19 | 1 | -11/+18 |
* | | | | am 0c282de7: am 77658a06: Merge "AudioPolicyService: malloc/delete pair" | Glenn Kasten | 2014-03-18 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | am 77658a06: Merge "AudioPolicyService: malloc/delete pair" | Glenn Kasten | 2014-03-18 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge "AudioPolicyService: malloc/delete pair" | Glenn Kasten | 2014-03-18 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | AudioPolicyService: malloc/delete pair | You Kim | 2013-09-12 | 1 | -1/+1 |
* | | | | | Merge "audioflinger: OffloadThread fix for resume underrun" | Eric Laurent | 2014-03-18 | 2 | -21/+27 |
|\ \ \ \ \ | |||||
| * | | | | | audioflinger: OffloadThread fix for resume underrun | Haynes Mathew George | 2014-03-17 | 2 | -21/+27 |
* | | | | | | Merge "AudioFlinger: Change track ready condition in STOPPING_1 state" | Eric Laurent | 2014-03-18 | 1 | -2/+4 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | AudioFlinger: Change track ready condition in STOPPING_1 state | Eric Laurent | 2014-03-17 | 1 | -2/+4 |
* | | | | | | Merge "audioflinger: Handle pause /resume in stopping state" | Eric Laurent | 2014-03-18 | 3 | -4/+37 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | audioflinger: Handle pause /resume in stopping state | Krishnankutty Kolathappilly | 2014-03-17 | 3 | -4/+37 |
* | | | | | | Merge "Remove deprecated BufferQueue constructor" | Dan Stoza | 2014-03-18 | 6 | -18/+30 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Remove deprecated BufferQueue constructor | Dan Stoza | 2014-03-12 | 6 | -18/+30 |
* | | | | | | Merge "audio policy: renamed AudioPolicyManagerBase to AudioPolicyManager" | Eric Laurent | 2014-03-18 | 2 | -158/+153 |
|\ \ \ \ \ \ | |||||
| * | | | | | | audio policy: renamed AudioPolicyManagerBase to AudioPolicyManager | Eric Laurent | 2014-03-11 | 2 | -158/+153 |
* | | | | | | | Merge "audio policy: remove dependency from AudioSystemLegacy" | Eric Laurent | 2014-03-18 | 3 | -243/+252 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | audio policy: remove dependency from AudioSystemLegacy | Eric Laurent | 2014-03-11 | 3 | -243/+252 |
* | | | | | | | Merge "audio policy: import audio policy manager from hardware legacy" | Eric Laurent | 2014-03-18 | 3 | -0/+4939 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | audio policy: import audio policy manager from hardware legacy | Eric Laurent | 2014-03-11 | 3 | -0/+4939 |
* | | | | | | | Merge "audio policy: split implementation" | Eric Laurent | 2014-03-18 | 4 | -642/+784 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | | | |||||
| * | | | | | audio policy: split implementation | Eric Laurent | 2014-03-11 | 4 | -642/+784 |
* | | | | | | am 557847ee: am a6ca0acf: am bd3e2e03: camera2: Fix segfault when using null ... | Igor Murashkin | 2014-03-18 | 1 | -0/+10 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | am a6ca0acf: am bd3e2e03: camera2: Fix segfault when using null availability ... | Igor Murashkin | 2014-03-18 | 1 | -0/+10 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | 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 |
* | | | | | | | | Merge "move audio policy service to a separate library" | Eric Laurent | 2014-03-18 | 4 | -3/+43 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | move audio policy service to a separate library | Eric Laurent | 2014-03-11 | 4 | -3/+43 |
* | | | | | | | | camera3: Remove old vendor tag ops dependencies. | Ruben Brunk | 2014-03-17 | 2 | -15/+0 |
* | | | | | | | | camera2: Don't log vendor tag errors when camera HAL too old | Igor Murashkin | 2014-03-17 | 1 | -1/+1 |
* | | | | | | | | Make error handling more similar for output and capture | Glenn Kasten | 2014-03-14 | 2 | -40/+43 |
* | | | | | | | | Make error handling for audio driver initCheck more similar | Glenn Kasten | 2014-03-14 | 1 | -8/+6 |
* | | | | | | | | Make session ID code similar between output and capture | Glenn Kasten | 2014-03-14 | 1 | -5/+5 |
* | | | | | | | | Move declarations to where needed | Glenn Kasten | 2014-03-14 | 1 | -5/+2 |
* | | | | | | | | Remove name output parameter from createTrack | Glenn Kasten | 2014-03-14 | 2 | -5/+0 |
* | | | | | | | | Replace if/else by switch | Glenn Kasten | 2014-03-14 | 1 | -3/+11 |
* | | | | | | | | Whitespace and comments | Glenn Kasten | 2014-03-14 | 3 | -5/+4 |
* | | | | | | | | Prepare for additional capture formats | Glenn Kasten | 2014-03-14 | 1 | -3/+3 |
* | | | | | | | | resolved conflicts for merge of 3c780188 to master | Glenn Kasten | 2014-03-14 | 3 | -0/+4 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | am 089affb6: Merge "mediaserver and associated services are 32-bit only" | Glenn Kasten | 2014-03-14 | 3 | -0/+4 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | * | | | | | | mediaserver and associated services are 32-bit only | Glenn Kasten | 2014-03-12 | 3 | -0/+4 |
| | * | | | | | | audioflinger: Fix for a deadlock in track creation | Haynes Mathew George | 2014-03-06 | 2 | -2/+5 |
| * | | | | | | | am f0fb921c: am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when ... | Zhijun He | 2014-03-11 | 1 | -0/+16 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| | * | | | | | | am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size ... | Zhijun He | 2014-03-11 | 1 | -0/+16 |
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | |||||
| | | * | | | | | DO NOT MERGE: Camera: delete preview callback when preview size is changed | Zhijun He | 2014-03-10 | 1 | -0/+16 |
| * | | | | | | | am 47ef192f: am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into kl... | Eino-Ville Talvala | 2014-03-07 | 3 | -55/+66 |
| |\ \ \ \ \ \ \ | | |/ / / / / / |