summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am 61280541: am 390ef843: am f20c4356: Merge "AudioRecord: use audio attribut...Eric Laurent2014-11-276-94/+99
|\
| * am 390ef843: am f20c4356: Merge "AudioRecord: use audio attributes instead of...Eric Laurent2014-11-276-94/+99
| |\
| | * AudioRecord: use audio attributes instead of audio source.Eric Laurent2014-11-256-94/+99
* | | am 51a7a415: am 5bf757cf: am 087eb332: Merge "audio policy: do not route acce...Eric Laurent2014-11-261-0/+15
|\ \ \ | |/ /
| * | am 5bf757cf: am 087eb332: Merge "audio policy: do not route accessibility pro...Eric Laurent2014-11-261-0/+15
| |\ \ | | |/
| | * Merge "audio policy: do not route accessibility prompts to compressed output"...Eric Laurent2014-11-261-0/+15
| | |\
| | | * audio policy: do not route accessibility prompts to compressed outputEric Laurent2014-11-251-0/+15
* | | | am 121143d5: am bf14c62e: am 72bf901c: Merge "audio policy: new getOutputForA...Eric Laurent2014-11-269-97/+222
|\ \ \ \ | |/ / /
| * | | am bf14c62e: am 72bf901c: Merge "audio policy: new getOutputForAttr() prototy...Eric Laurent2014-11-269-97/+222
| |\ \ \ | | |/ /
| | * | Merge "audio policy: new getOutputForAttr() prototype." into lmp-mr1-devEric Laurent2014-11-269-97/+222
| | |\ \ | | | |/
| | | * audio policy: new getOutputForAttr() prototype.Eric Laurent2014-11-259-97/+222
* | | | am d802d071: am ec7b26f0: am 512dd849: Merge "camera: fix frame deletion logi...Zhijun He2014-11-261-2/+6
|\ \ \ \ | |/ / /
| * | | am ec7b26f0: am 512dd849: Merge "camera: fix frame deletion logic in mInFligh...Zhijun He2014-11-261-2/+6
| |\ \ \ | | |/ /
| | * | Merge "camera: fix frame deletion logic in mInFlightMap" into lmp-mr1-devZhijun He2014-11-251-2/+6
| | |\ \ | | | |/ | | |/|
| | | * camera: fix frame deletion logic in mInFlightMapRuchit Sharma2014-11-251-2/+6
* | | | am e0f44009: am fcf39e22: am 0f78eabb: fix the build.Eric Laurent2014-11-261-8/+1
|\ \ \ \ | |/ / /
| * | | am fcf39e22: am 0f78eabb: fix the build.Eric Laurent2014-11-261-8/+1
| |\ \ \ | | |/ /
| | * | fix the build.Eric Laurent2014-11-251-8/+1
* | | | am 72215491: am 1a475921: am 223fd5c9: audio: new routing strategies and stre...Eric Laurent2014-11-2611-53/+170
|\ \ \ \ | |/ / /
| * | | am 1a475921: am 223fd5c9: audio: new routing strategies and stream typesEric Laurent2014-11-2611-53/+170
| |\ \ \ | | |/ /
| | * | audio: new routing strategies and stream typesEric Laurent2014-11-2111-53/+170
| | |/
* | | am ffa3e71e: am bc0f452b: Merge "Camera2: Fix CameraParameters parse segfault...Ruben Brunk2014-11-211-0/+1
|\ \ \ | |/ /
| * | am ffa3e71e: am bc0f452b: Merge "Camera2: Fix CameraParameters parse segfault...Ruben Brunk2014-11-211-0/+1
| |\ \ | | |/
| | * Merge "Camera2: Fix CameraParameters parse segfault." into lmp-mr1-devRuben Brunk2014-11-211-0/+1
| | |\
| | | * Camera2: Fix CameraParameters parse segfault.Ruben Brunk2014-11-201-0/+1
| * | | am 30dee177: am 8052d933: Merge "SoundTrigger: allow sound model reloading" i...Eric Laurent2014-11-212-0/+19
| |\ \ \ | | |/ /
| * | | am d48f1b68: am f50db74f: Merge "Fix format conversion in DuplicatingThread" ...Glenn Kasten2014-11-211-8/+8
| |\ \ \
* | \ \ \ am 58cc16ef: am 8052d933: Merge "SoundTrigger: allow sound model reloading" i...Eric Laurent2014-11-212-0/+19
|\ \ \ \ \
| * \ \ \ \ am 8052d933: Merge "SoundTrigger: allow sound model reloading" into lmp-mr1-devEric Laurent2014-11-212-0/+19
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "SoundTrigger: allow sound model reloading" into lmp-mr1-devEric Laurent2014-11-202-0/+19
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | SoundTrigger: allow sound model reloadingEric Laurent2014-11-202-0/+19
* | | | | | am c63c0973: am f50db74f: Merge "Fix format conversion in DuplicatingThread" ...Glenn Kasten2014-11-211-8/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am f50db74f: Merge "Fix format conversion in DuplicatingThread" into lmp-mr1-devGlenn Kasten2014-11-211-8/+8
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |
| | * | | Fix format conversion in DuplicatingThreadHaynes Mathew George2014-11-201-8/+8
| | |/ /
* | | | am 568689b1: am 3a2a32b5: Merge "AudioSystem: fix cross deadlock" into lmp-mr...Eric Laurent2014-11-212-8/+11
|\ \ \ \ | |/ / /
| * | | am 568689b1: am 3a2a32b5: Merge "AudioSystem: fix cross deadlock" into lmp-mr...Eric Laurent2014-11-212-8/+11
| |\ \ \ | | |/ /
| | * | AudioSystem: fix cross deadlockEric Laurent2014-11-202-8/+11
| | |/
* | | am d0e12a16: am 902dc42d: am 07715ac3: Merge "C++11 compatibility."Dan Albert2014-11-206-15/+21
|\ \ \ | |/ /
| * | am 902dc42d: am 07715ac3: Merge "C++11 compatibility."Dan Albert2014-11-206-15/+21
| |\ \
| | * | C++11 compatibility.Dan Albert2014-11-206-15/+21
* | | | am a848844f: am cb79b3db: am 03181012: Merge "Camera2Client: remove recording...Yin-Chia Yeh2014-11-193-7/+56
|\ \ \ \ | |/ / /
| * | | am cb79b3db: am 03181012: Merge "Camera2Client: remove recording stream if ne...Yin-Chia Yeh2014-11-193-7/+56
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Camera2Client: remove recording stream if necessary" into lmp-mr1-devYin-Chia Yeh2014-11-193-7/+56
| | |\ \
| | | * | Camera2Client: remove recording stream if necessaryYin-Chia Yeh2014-11-183-7/+56
* | | | | Merge "Fix AudioMixer floating interaction with downmixer"Andy Hung2014-11-194-56/+136
|\ \ \ \ \
| * | | | | Fix AudioMixer floating interaction with downmixerAndy Hung2014-11-074-56/+136
* | | | | | Merge "Move AudioMixer buffer provider preparation into track"Andy Hung2014-11-192-74/+66
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Move AudioMixer buffer provider preparation into trackAndy Hung2014-11-072-74/+66
* | | | | | am 640228b8: am 9b323821: am e4044209: Merge "Disable clang++ due to compiler...Chih-Hung Hsieh2014-11-192-0/+12
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 9b323821: am e4044209: Merge "Disable clang++ due to compiler error."Chih-Hung Hsieh2014-11-192-0/+12
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |