summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am a2340b30: Merge "Don\'t call audio effect process on offloaded playback th...Jean-Michel Trivi2013-09-301-3/+4
|\
| * Merge "Don't call audio effect process on offloaded playback threads" into kl...Jean-Michel Trivi2013-09-271-3/+4
| |\
| | * Don't call audio effect process on offloaded playback threadsJean-Michel Trivi2013-09-261-3/+4
* | | am 0adc67df: Merge "audioflinger: fix crash when starting offload thread" int...Eric Laurent2013-09-302-13/+13
|\ \ \ | |/ /
| * | Merge "audioflinger: fix crash when starting offload thread" into klp-devEric Laurent2013-09-262-13/+13
| |\ \
| | * | audioflinger: fix crash when starting offload threadEric Laurent2013-09-262-13/+13
* | | | am 1da3b602: Camera2 API: Hack: Always use async mode with GLConsumerEino-Ville Talvala2013-09-301-1/+18
|\ \ \ \ | |/ / /
| * | | Camera2 API: Hack: Always use async mode with GLConsumerEino-Ville Talvala2013-09-261-1/+18
* | | | am 369af71e: am 6914de6d: Merge "Camera: Implement getCameraCharacteristics" ...Zhijun He2013-09-254-0/+80
|\ \ \ \
| * \ \ \ am 6914de6d: Merge "Camera: Implement getCameraCharacteristics" into klp-devZhijun He2013-09-254-0/+80
| |\ \ \ \ | | |/ / /
| | * | | Merge "Camera: Implement getCameraCharacteristics" into klp-devZhijun He2013-09-254-0/+80
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Camera: Implement getCameraCharacteristicsZhijun He2013-09-254-0/+80
| | | |/
* | | | am 4e141a4f: am 1802399c: Merge "fix deadlock in audioflinger::createEffect()...Eric Laurent2013-09-252-21/+22
|\ \ \ \ | |/ / /
| * | | am 1802399c: Merge "fix deadlock in audioflinger::createEffect()" into klp-devEric Laurent2013-09-252-21/+22
| |\ \ \ | | |/ /
| | * | Merge "fix deadlock in audioflinger::createEffect()" into klp-devEric Laurent2013-09-252-21/+22
| | |\ \
| | | * | fix deadlock in audioflinger::createEffect()Eric Laurent2013-09-252-21/+22
| | | |/
* | | | am 8318c786: am 2b890936: Merge "Camera2/3: Support new PASSIVE_UNFOCUSED AF ...Eino-Ville Talvala2013-09-251-0/+3
|\ \ \ \ | |/ / /
| * | | am 2b890936: Merge "Camera2/3: Support new PASSIVE_UNFOCUSED AF state" into k...Eino-Ville Talvala2013-09-251-0/+3
| |\ \ \ | | |/ /
| | * | Merge "Camera2/3: Support new PASSIVE_UNFOCUSED AF state" into klp-devEino-Ville Talvala2013-09-251-0/+3
| | |\ \
| | | * | Camera2/3: Support new PASSIVE_UNFOCUSED AF stateEino-Ville Talvala2013-09-201-0/+3
* | | | | am 9843e8c9: am 58dd0786: Merge "Send kWhatConnected in onTimeUpdate() before...Chong Zhang2013-09-251-17/+23
|\ \ \ \ \ | |/ / / /
| * | | | am 58dd0786: Merge "Send kWhatConnected in onTimeUpdate() before first access...Chong Zhang2013-09-251-17/+23
| |\ \ \ \ | | |/ / /
| | * | | Merge "Send kWhatConnected in onTimeUpdate() before first access unit" into k...Chong Zhang2013-09-251-17/+23
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Send kWhatConnected in onTimeUpdate() before first access unitChong Zhang2013-09-241-17/+23
* | | | | am a35b4278: am 6c63fe0f: am ab70649e: Merge "MediaCodec: Pass the crop rect ...Lajos Molnar2013-09-251-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | am 6c63fe0f: am ab70649e: Merge "MediaCodec: Pass the crop rect to SoftwareRe...Lajos Molnar2013-09-251-0/+6
| |\ \ \ \
| | * \ \ \ am ab70649e: Merge "MediaCodec: Pass the crop rect to SoftwareRenderer"Lajos Molnar2013-09-251-0/+6
| | |\ \ \ \
| | | * \ \ \ Merge "MediaCodec: Pass the crop rect to SoftwareRenderer"Lajos Molnar2013-09-251-0/+6
| | | |\ \ \ \
| | | | * | | | MediaCodec: Pass the crop rect to SoftwareRendererMartin Storsjo2013-09-251-0/+6
| | | |/ / / /
* | | | | | | am 42d4e659: am d2ac3144: Merge "Fix log typos in Visualizer effect" into klp...Jean-Michel Trivi2013-09-241-9/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am d2ac3144: Merge "Fix log typos in Visualizer effect" into klp-devJean-Michel Trivi2013-09-241-9/+7
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge "Fix log typos in Visualizer effect" into klp-devJean-Michel Trivi2013-09-241-9/+7
| | |\ \ \ \ \
| | | * | | | | Fix log typos in Visualizer effectJean-Michel Trivi2013-09-241-9/+7
* | | | | | | | am 920e45e5: am ddfbfaeb: fix oflload effect proxy commmand handlingEric Laurent2013-09-242-46/+54
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am ddfbfaeb: fix oflload effect proxy commmand handlingEric Laurent2013-09-242-46/+54
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | fix oflload effect proxy commmand handlingEric Laurent2013-09-242-46/+54
* | | | | | | | am 8ee02943: am 1c7f35d1: Merge "soundpool: allocate shared memory heap by cl...Eric Laurent2013-09-249-83/+162
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 1c7f35d1: Merge "soundpool: allocate shared memory heap by client" into kl...Eric Laurent2013-09-249-83/+162
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "soundpool: allocate shared memory heap by client" into klp-devEric Laurent2013-09-249-83/+162
| | |\ \ \ \ \ \
| | | * | | | | | soundpool: allocate shared memory heap by clientEric Laurent2013-09-249-83/+162
* | | | | | | | | am 50ad1d36: am 1ecd3dc4: Merge "Camera2/3: Properly disambiguate FPS range v...Eino-Ville Talvala2013-09-242-5/+19
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 1ecd3dc4: Merge "Camera2/3: Properly disambiguate FPS range vs. single FPS...Eino-Ville Talvala2013-09-242-5/+19
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Camera2/3: Properly disambiguate FPS range vs. single FPS setting" int...Eino-Ville Talvala2013-09-242-5/+19
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | | * | | | | | Camera2/3: Properly disambiguate FPS range vs. single FPS settingEino-Ville Talvala2013-09-202-5/+19
* | | | | | | | | am a57e2ab5: am 664539d2: audioflinger: fix ro.audio.silent in offload againEric Laurent2013-09-241-0/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 664539d2: audioflinger: fix ro.audio.silent in offload againEric Laurent2013-09-241-0/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | audioflinger: fix ro.audio.silent in offload againEric Laurent2013-09-231-0/+2
| | | |/ / / / / | | |/| | | | |
* | | | | | | | am c7b2f9dc: am 402dfba6: Merge "Add support for level measurements in Visual...Jean-Michel Trivi2013-09-243-17/+214
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 402dfba6: Merge "Add support for level measurements in Visualizer" into kl...Jean-Michel Trivi2013-09-233-17/+214
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Add support for level measurements in Visualizer" into klp-devJean-Michel Trivi2013-09-233-17/+214
| | |\ \ \ \ \ \