summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge "Disable clang++ due to compiler error."Chih-Hung Hsieh2014-11-182-0/+12
| | |\ \ \ \
| | | * | | | Disable clang++ due to compiler error.Chih-Hung Hsieh2014-11-142-0/+12
* | | | | | | am 9544a8e9: am bfa77b5c: am 8cd37d67: Merge "audio policy: do not prevent ro...Eric Laurent2014-11-181-4/+12
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am bfa77b5c: am 8cd37d67: Merge "audio policy: do not prevent routing to A2DP...Eric Laurent2014-11-181-4/+12
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge "audio policy: do not prevent routing to A2DP when suspended." into lmp...Eric Laurent2014-11-181-4/+12
| | |\ \ \ \ \
| | | * | | | | audio policy: do not prevent routing to A2DP when suspended.Eric Laurent2014-11-171-4/+12
* | | | | | | | am a248703b: am a3e2c146: am 4d0a5985: Merge "Prevent stopped audio tracks fr...Andy Hung2014-11-181-8/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am a3e2c146: am 4d0a5985: Merge "Prevent stopped audio tracks from mixing dat...Andy Hung2014-11-181-8/+9
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Prevent stopped audio tracks from mixing data" into lmp-mr1-devAndy Hung2014-11-181-8/+9
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Prevent stopped audio tracks from mixing dataAndy Hung2014-11-171-8/+9
| | | | |_|_|/ | | | |/| | |
* | | | | | | am 22bfb336: am 2b456a16: am f89f2ff4: Merge "audiopolicy: Update input devic...Eric Laurent2014-11-171-3/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 2b456a16: am f89f2ff4: Merge "audiopolicy: Update input device check in ch...Eric Laurent2014-11-171-3/+6
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "audiopolicy: Update input device check in checkInputsForDevice" into l...Eric Laurent2014-11-171-3/+6
| | |\ \ \ \ \
| | | * | | | | audiopolicy: Update input device check in checkInputsForDeviceEric Laurent2014-11-171-3/+6
| | | |/ / / /
* | | | | | | am f1b0c671: am 2716969d: resolved conflicts for merge of 3bc345f5 to stage-a...Elliott Hughes2014-11-171-7/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 2716969d: resolved conflicts for merge of 3bc345f5 to stage-aosp-masterElliott Hughes2014-11-171-7/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | libcutils no longer requires that its users configure ANDROID_SMP.Elliott Hughes2014-11-171-7/+0
* | | | | | | am bf1e36e8: am 771a362d: am 3171f4e1: Merge "CameraService: normalize face r...Chien-Yu Chen2014-11-173-73/+90
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 771a362d: am 3171f4e1: Merge "CameraService: normalize face rectangles pro...Chien-Yu Chen2014-11-173-73/+90
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "CameraService: normalize face rectangles properly" into lmp-mr1-devChien-Yu Chen2014-11-173-73/+90
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | CameraService: normalize face rectangles properlyChien-Yu Chen2014-11-133-73/+90